Updated deps, cleaned up gemspec, got rid of metric_fu dep

tindron · Mar 3, 2012 · c90780a · c90780a
1 parent 44559fc
commit c90780a
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 128 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,112 +1,59 @@
 PATH
-  remote: .
+  remote: ../rtp
   specs:
-    rtsp (0.2.2)
-      parslet (~> 1.1.0)
-      sdp (~> 0.2.2)
+    rtp (0.0.1)
+      bindata (~> 1.4)
+      log_switch (>= 0.2.0)
 
 PATH
-  remote: ../rtp
+  remote: .
   specs:
-    rtp (0.1.0)
-      bindata
-      log_switch
+    rtsp (0.2.2)
+      parslet (>= 1.1.0)
+      sdp (~> 0.2.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    Saikuro (1.1.0)
-    activesupport (3.1.1)
-      multi_json (~> 1.0)
     bindata (1.4.3)
     blankslate (2.1.2.4)
-    chronic (0.3.0)
-    churn (0.0.13)
-      chronic (>= 0.2.3)
-      hirb
-      json_pure
-      main
-      ruby_parser (~> 2.0.4)
-      sexp_processor (~> 3.0.3)
     code_statistics (0.2.13)
-    colored (1.2)
     diff-lcs (1.1.3)
-    erubis (2.7.0)
-    flay (1.4.3)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    flog (2.5.3)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    hirb (0.5.0)
-    i18n (0.6.0)
-    json_pure (1.6.1)
-    log_switch (0.1.4)
-    main (4.7.1)
-    metric_fu (2.1.1)
-      Saikuro (>= 1.1.0)
-      activesupport (>= 2.0.0)
-      chronic (~> 0.3.0)
-      churn (>= 0.0.7)
-      flay (>= 1.2.1)
-      flog (>= 2.3.0)
-      rails_best_practices (>= 0.6.4)
-      rcov (>= 0.8.3.3)
-      reek (>= 1.2.6)
-      roodi (>= 2.1.0)
-      syntax
-    multi_json (1.0.3)
-    parslet (1.1.1)
+    log_switch (0.3.0)
+    multi_json (1.1.0)
+    parslet (1.2.3)
       blankslate (~> 2.0)
-    progressbar (0.9.1)
-    rails_best_practices (1.2.0)
-      activesupport
-      colored
-      erubis
-      i18n
-      progressbar
-      sexp_processor
     rake (0.9.2.2)
-    rcov (0.9.11)
-    rcov (0.9.11-java)
-    reek (1.2.8)
-      ruby2ruby (~> 1.2)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
     roodi (2.1.0)
       ruby_parser
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    ruby2ruby (1.3.1)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    ruby_parser (2.0.6)
+    rspec-mocks (2.8.0)
+    ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sdp (0.2.4)
-      parslet (~> 1.1.0)
-    sexp_processor (3.0.7)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    sdp (0.2.6)
+      parslet (>= 1.1.0)
+    sexp_processor (3.1.0)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    syntax (1.0.0)
-    yard (0.7.3)
+    yard (0.7.5)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler
   code_statistics (~> 0.2.13)
-  metric_fu (>= 2.0.0)
   rake (>= 0.8.7)
+  roodi (>= 2.1.0)
   rspec (>= 2.5.0)
   rtp!
   rtsp!

diff --git a/rtsp.gemspec b/rtsp.gemspec
@@ -8,36 +8,30 @@ Gem::Specification.new do |s|
   s.name = "rtsp"
   s.version = RTSP::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Steve Loveless, Mike Kirby"]
-  s.date = %q{2011-04-14}
+  s.homepage = %q{http://rubygems.org/gems/rtsp}
+  s.authors = ["Steve Loveless, Mike Kirby", "Sujin Philip"]
+  s.summary = %q{Library to allow RTSP streaming from RTSP-enabled devices.}
   s.description = %q{This library intends to follow the RTSP RFC document (2326)
 to allow for working with RTSP servers.  At this point, it's up to you to parse
 the data from a play call, but we'll get there.  ...eventually.
 For more information see: http://www.ietf.org/rfc/rfc2326.txt}
-  s.email = ["[email protected], [email protected]"]
-  s.executables = ["rtsp_client"]
-  s.extra_rdoc_files = [
-    "ChangeLog.rdoc",
-      "LICENSE.rdoc",
-      "README.rdoc"
-  ]
-  s.files = Dir.glob("{lib,bin,tasks}/**/*") + Dir.glob("*.rdoc") +
+  s.email = %w{[email protected]}
+  s.licenses = %w{MIT}
+
+  s.executables = %w{rtsp_client}
+  s.files = Dir.glob("{lib,bin,spec,tasks}/**/*") + Dir.glob("*.rdoc") +
     %w(.gemtest rtsp.gemspec Gemfile Rakefile)
-  s.homepage = %q{http://rubygems.org/gems/rtsp}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{rtsp}
+  s.extra_rdoc_files = %w{ChangeLog.rdoc LICENSE.rdoc README.rdoc}
+  s.require_paths = %w{lib}
   s.rubygems_version = %q{1.7.2}
-  s.summary = %q{Library to allow RTSP streaming from RTSP-enabled devices.}
   s.test_files = Dir.glob("{spec,features}/**/*")
 
   s.add_runtime_dependency(%q<parslet>, [">= 1.1.0"])
   s.add_runtime_dependency(%q<sdp>, ["~> 0.2.6"])
 
-  s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+  s.add_development_dependency(%q<bundler>)
   s.add_development_dependency(%q<code_statistics>, ["~> 0.2.13"])
-  s.add_development_dependency(%q<metric_fu>, [">= 2.0.0"])
+  s.add_development_dependency(%q<roodi>, [">= 2.1.0"])
   s.add_development_dependency(%q<rake>, [">= 0.8.7"])
   s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
   s.add_development_dependency(%q<simplecov>, [">= 0.4.0"])

diff --git a/tasks/metrics.rake b/tasks/metrics.rake
diff --git a/tasks/roodi.rake b/tasks/roodi.rake
@@ -0,0 +1,9 @@
+require 'rake/tasklib'  # roodi_task fails without this.
+require 'roodi'
+require 'roodi_task'
+
+RoodiTask.new do |t|
+  t.config = 'tasks/roodi_config.yaml'
+  t.patterns = Dir.glob("{features,lib,spec}/**/*.rb")
+  t.verbose = true
+end
diff --git a/tasks/roodi_config.yml → tasks/roodi_config.yaml b/tasks/roodi_config.yml → tasks/roodi_config.yaml
@@ -2,13 +2,13 @@
 AssignmentInConditionalCheck:    { }
 CaseMissingElseCheck:            { }
 ClassLineCountCheck:             { line_count: 300 }
-ClassNameCheck:                  { pattern: !ruby/regexp /^[A-Z][a-zA-Z0-9]*$/ }
+ClassNameCheck:                  { pattern: !ruby/regexp '/^[A-Z][a-zA-Z0-9]*$/' }
 CyclomaticComplexityBlockCheck:  { complexity: 4 }
 CyclomaticComplexityMethodCheck: { complexity: 8 }
 EmptyRescueBodyCheck:            { }
 ForLoopCheck:                    { }
 MethodLineCountCheck:            { line_count: 30 }
-MethodNameCheck:                 { pattern: !ruby/regexp /^[_a-z<>=\[\]|+-\/\*`]+[_a-z0-9_<>=~@\[\]]*[=!\?]?$/ }
+MethodNameCheck:                 { pattern: !ruby/regexp '/^[_a-z<>=\[\]|+-\/\*`]+[_a-z0-9_<>=~@\[\]]*[=!\?]?$/' }
 ModuleLineCountCheck:            { line_count: 300 }
-ModuleNameCheck:                 { pattern: !ruby/regexp /^[A-Z][a-zA-Z0-9]*$/ }
+ModuleNameCheck:                 { pattern: !ruby/regexp '/^[A-Z][a-zA-Z0-9]*$/' }
 ParameterNumberCheck:            { parameter_count: 5 }