runcoderun-gem_sync 1.1.1 → 1.1.4

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.4

data/examples/rcr/gem_parser_example.rb

@@ -41,6 +41,12 @@ ZenTest (3.10.0, 3.9.2, 3.9.1, 3.8.0, 3.6.0)]
     end
 
     describe "parsing platforms" do
+      it "should return nil for no platforms" do
+        list = %[rambow_likes_gerbils (<= 7.3.2)]
+        gem = Rcr::GemParser.convert_gem_list(list).first
+        gem.platforms.should be_nil
+      end
+      
       it "is parses a single platform" do
         list = %[rambow_likes_gerbils (<= 7.3.2) +ruby186]
         gem = Rcr::GemParser.convert_gem_list(list).first

data/examples/rcr/gem_sync_example.rb

@@ -2,12 +2,6 @@ require 'examples/example_helper'
 
 describe Rcr::GemSync do
 
-  describe "creating a gem_sync" do
-    it "saves github gem list source" do
-      Rcr::GemSync.new(["--github"]).gem_list.should == Rcr::GemSync::RCR_GITHUB_GEM_LIST
-    end
-  end
-  
   describe "sync" do
     it "should read gem list, install each gem, ..." do
       gem_sync = Rcr::GemSync.new(["--github"])
@@ -19,14 +13,22 @@ describe Rcr::GemSync do
   end
   
   describe "install_gems" do
-    it "should iterate over each gem, and install unless already installed" do
+    it "should iterate over each gem and install!" do
       gem_sync = Rcr::GemSync.new(["--github"])
       gem_sync.expects(:read_gem_list).returns(<<-EOL)
 gem1 (1.0.0)
 gem2 (1.0.0)      
 EOL
-      gem_sync.stubs(:installed?).returns(true, false)
-      gem_sync.expects(:install!).once
+      gem_sync.expects(:run).times(2).returns(true)
+      gem_sync.sync
+    end
+    
+    it "should install gems that have no platform, even when gem sync platform is specified" do
+      gem_sync = Rcr::GemSync.new(["-p ruby191"])
+      gem_sync.expects(:read_gem_list).returns(<<-EOL)
+gem1 (1.0.0)
+EOL
+      gem_sync.expects(:run).once.returns(true)
       gem_sync.sync
     end
     
@@ -35,12 +37,20 @@ EOL
       gem_sync.expects(:read_gem_list).returns(<<-EOL)
 gem1 (1.0.0) +jruby130
 EOL
-      gem_sync.expects(:install!).never
+      gem_sync.expects(:run).never
       gem_sync.sync
     end
   end
   
   describe "install!" do
+    it "should skip if already installed" do
+      gem = stub_everything("gem", :name => "foo")
+      gem_sync = Rcr::GemSync.new
+      gem_sync.expects(:installed?).with(gem).returns(true)
+      gem_sync.expects(:run).never
+      gem_sync.install!(gem)
+    end
+    
     it "should try installing as rubyforge first" do
       gem = OpenStruct.new(:name => "foo", :version => "1.0.0")
       gem_sync = Rcr::GemSync.new
@@ -62,6 +72,11 @@ EOL
       Rcr::GemSync.new.platform_matches?(OpenStruct.new).should == true
     end
     
+    it "should return true if gem sync platform is specified and gem has no platform" do
+      gem_sync = Rcr::GemSync.new(["-p ruby191"])
+      gem_sync.platform_matches?(OpenStruct.new).should == true
+    end
+    
     it "should return false gem sync and gem platform do not match" do
       gem_sync = Rcr::GemSync.new(["-p ruby191"])
       gem_sync.platform_matches?(OpenStruct.new(:platforms => ["jruby130"])).should == false

data/gem_sync.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gem_sync}
-  s.version = "1.1.1"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Sanheim"]
-  s.date = %q{2009-09-04}
+  s.date = %q{2009-09-06}
   s.default_executable = %q{gem_sync}
   s.description = %q{Tool to install rubygems for RunCodeRun, though it could be used to bootstrap your own machines as well.}
   s.email = %q{rob@runcoderun.com}

data/lib/rcr/gem_parser.rb

@@ -34,7 +34,8 @@ module Rcr
     end
   
     def self.parse_platforms(string)
-      string.scan(/\+[\w-]+\b/).map! { |platform| platform.gsub!('+', '') }
+      platforms = string.scan(/\+[\w-]+\b/).map! { |platform| platform.gsub!('+', '') }
+      platforms.empty? ? nil : platforms
     end
     
     

data/lib/rcr/gem_sync.rb

@@ -9,7 +9,6 @@ module Rcr
     RCR_GITHUB_GEM_LIST =      "http://github.com/runcoderun/gem_sync/raw/master/lib/runcoderun_gems.txt"
     RCR_GITHUB_GEM_BLACKLIST = "http://github.com/runcoderun/gem_sync/raw/master/lib/gem_blacklist.txt"
 
-    attr_accessor :gem_list
     def initialize(args = ["--github"])
       options = Rcr::OptionParsing.parse(args)
       @platform = options[:platform]
@@ -19,6 +18,12 @@ module Rcr
       system("gem env") if verbose?
     end
     
+    def sync
+      @gem_list = read_gem_list
+      @gems = parse_gems
+      install_gems
+    end
+    
     def verbose?
       @verbose
     end
@@ -28,7 +33,7 @@ module Rcr
     end
     
     def read_gem_list
-      open(gem_list).read
+      open(@gem_list).read
     end
     
     def platform_matches?(gem)
@@ -39,22 +44,18 @@ module Rcr
       end
     end
     
-    def sync
-      @gem_list = read_gem_list
-      @gems = parse_gems
-      install_gems
-    end
-    
     def parse_gems
       @gems = Rcr::GemParser.convert_gem_list(@gem_list)
     end
     
     def install_gems
-      @gems.each do |rubygem|
-        next unless platform_matches?(rubygem)
-        next if installed?(rubygem)
-        install!(rubygem)
-      end
+      @gems.each { |rubygem| install!(rubygem) }
+    end
+
+    def install!(rubygem)
+      return unless platform_matches?(rubygem)
+      return if installed?(rubygem)
+      install_from_rubyforge(rubygem) || install_from_github(rubygem)
     end
     
     def installed?(rubygem)
@@ -65,10 +66,6 @@ module Rcr
       @installed_gems ||= Rcr::GemParser.convert_gem_list(`gem list`)
     end
     
-    def install!(rubygem)
-      install_from_rubyforge(rubygem) || install_from_github(rubygem)
-    end
-    
     def install_from_rubyforge(rubygem)
       cmd = "gem install #{rubygem.name} --no-ri --no-rdoc"
       cmd << " --version #{rubygem.version}" if rubygem.version

data/lib/runcoderun_gems.txt

@@ -9,21 +9,21 @@ activerecord (2.3.2, 2.2.2, 2.1.2, 2.1.1, 2.1.0, 2.0.2, 2.0.1, 1.15.6)
 activeresource (2.3.2, 2.2.2, 2.1.2, 2.1.0, 2.0.2, 2.0.1)
 activesupport (2.3.2, 2.2.2, 2.1.2, 2.1.1, 2.1.0, 2.0.2, 2.0.1, 1.4.4)
 activemerchant
-acts_as_reportable (1.1.1)
+acts_as_reportable
 addressable (2.0.2, 1.0.4)
-allison (2.0.3)
+allison
 andand
 andre-geokit
 antage-postgres +ruby_191
-archive-tar-minitar (0.5.2)
+archive-tar-minitar
 ar-extensions
 arrayfields (4.7.3, 4.6.0)
 authlogic
 aws-s3
 bacon
 bcrypt-ruby (2.0.5, 2.0.3)
-beanstalk-client (1.0.2)
-bj (1.0.1)
+beanstalk-client
+bj
 bmabey-email_spec
 builder (2.1.2)
 cache_money
@@ -36,11 +36,11 @@ chronic
 coderay
 colors
 configatron (2.2.2, 2.1.5)
-configuration (0.0.5)
+configuration
 context
 crack
 csv-mapper (0.0.3)
-cucumber (0.3.96, 0.3.94, 0.3.92, 0.3.9, 0.3.11, 0.3.0)
+cucumber (0.3.96, 0.3.94, 0.3.92, 0.3.9)
 curb +ruby_186 +ruby_191
 daemons
 dancroak-clearance
@@ -80,7 +80,7 @@ feedvalidator
 ferret
 fireeagle
 flay (1.3.0, 1.2.1)
-flexmock (0.8.6, 0.8.3, 0.8.2)
+flexmock
 flog (2.1.0, 2.0.0, 1.1.0)
 freelancing-god-ginger
 freelancing-god-thinking-sphinx
@@ -106,7 +106,7 @@ httpauth
 httpclient
 ianwhite-garlic
 icalendar (1.1.0, 1.0.2)
-image_science (1.1.3) +ruby_186 +ruby_191
+image_science +ruby_186 +ruby_191
 innate
 javan-whenever
 jeremymcanally-context
@@ -124,7 +124,7 @@ kematzy-sinatra-cache
 lame_encoder
 launchy (0.3.3, 0.3.2)
 less
-libxml-ruby (1.1.3, 0.9.8, 0.8.3) +ruby_186 +ruby_191
+libxml-ruby +ruby_186 +ruby_191
 Linguistics
 liquid
 locale
@@ -248,7 +248,7 @@ ruby-xslt
 rubyist-aasm 
 runcoderun-configatron
 runcoderun-gem_sync
-ruport (1.6.1)
+ruport
 schacon-git (1.0.7)
 selenium
 selenium-client
@@ -267,14 +267,14 @@ stomp
 stone
 syntax
 systemu (1.2.0)
-system_timer (1.0)
+system_timer +ruby_186 +ruby_191
 taf2-curb
 tagz
 technicalpickles-echoe
 technicalpickles-jeweler
 term-ansicolor
 termios
-test-spec (0.10.0, 0.9.0)
+test-spec
 thin
 thinking_sphinx
 thoughtbot-clearance

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: runcoderun-gem_sync
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.4
 platform: ruby
 authors: 
 - Rob Sanheim
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 -07:00
+date: 2009-09-06 00:00:00 -07:00
 default_executable: gem_sync
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,6 @@ files:
 - lib/runcoderun_gems.txt
 has_rdoc: false
 homepage: http://github.com/runcoderun/gem_sync
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -73,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: gem_sync