RubyGems - hubless - Versions diffs - 0.1.3 → 0.2.0 - Mend

hubless 0.1.3 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

data/README.markdown CHANGED Viewed

@@ -4,7 +4,7 @@ Search your local gem repository for gems installed from GitHub that have since
 ## Command line usage
-	$ hubless
+	$ hubless [-i|-h]
 ## Sample output

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.1.3
1	+ 0.2.0

data/hubless.gemspec CHANGED Viewed

@@ -5,7 +5,7 @@
 Gem::Specification.new do |s|
   s.name = %q{hubless}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Greg Sterndale"]

data/lib/application.rb CHANGED Viewed

@@ -4,14 +4,39 @@ class Hubless
   class Application
     def self.run(*args)
-      hubless = Hubless.new
-      hubless.gem_breakdown
-      hubless.github_repos
-      hubless.gemcutter_gems
-      hubless.uninstall_instructions
-      hubless.install_instructions
+      if help_option?(args)
+        display_help
+      else
+        hubless = Hubless.new
+        hubless.gem_breakdown
+        hubless.github_repos
+        hubless.gemcutter_gems
+        hubless.uninstall_instructions
+        if install_option?(args)
+          hubless.install_gems
+        else
+          hubless.install_instructions
+        end
+      end
       return 0
     end
+  protected
+    def self.display_help
+      $stdout.puts "Search your local gem repository for gems installed from GitHub that have since moved to Gemcutter"
+      $stdout.puts "Usage: hubless [-i|-h] "
+      $stdout.puts "\t-i, --install\tinstall GitHub gems that are on Gemcutter (consider running with sudo)"
+      $stdout.puts "\t-h, --help\tdisplay this help and exit"
+    end
+    def self.install_option?(args)
+      args.include?('-i') || args.include?('--install')
+    end
+    def self.help_option?(args)
+      args.include?('-h') || args.include?('--help')
+    end
   end
 end

data/lib/gem_description.rb CHANGED Viewed

@@ -2,141 +2,141 @@ require 'rubygems'
 require 'net/http'
 class Hubless
-ServiceError = Class.new(RuntimeError)
+  class ServiceError < StandardError; end
-class GemDescription
+  class GemDescription
-  attr_reader :name
-  attr_accessor :version
+    attr_reader :name
+    attr_accessor :version
-  # GemDescriptions of all gems installed locally
-  def self.local_gems
-    @@local_gems ||= Gem.cache.map {|g| new(g.first) }.sort!{|x,y| y.name <=> x.name }
-  end
+    # GemDescriptions of all gems installed locally
+    def self.local_gems
+      @@local_gems ||= Gem.cache.map {|g| new(g.first) }.sort!{|x,y| y.name <=> x.name }
+    end
-  # New GemDescription from a one-liner or options Hash
-  # Hubless::GemDescription.new('my-awesome_gem-3.4.5')
-  # Hubless::GemDescription.new(:name => 'my-awesome_gem', :version => '3.4.5')
-  def initialize(*args)
-    case args.first
-    when String
-      self.attributes_from_one_liner(args.first)
-    when Hash
-      self.name    = args.first[:name]
-      self.version = args.first[:version]
+    # New GemDescription from a one-liner or options Hash
+    # Hubless::GemDescription.new('my-awesome_gem-3.4.5')
+    # Hubless::GemDescription.new(:name => 'my-awesome_gem', :version => '3.4.5')
+    def initialize(*args)
+      case args.first
+      when String
+        self.attributes_from_one_liner(args.first)
+      when Hash
+        self.name    = args.first[:name]
+        self.version = args.first[:version]
+      end
     end
-  end
-  # Assign gem description name and clear any cached values
-  def name=(str)
-    self.clear
-    @name = str
-  end
+    # Assign gem description name and clear any cached values
+    def name=(str)
+      self.clear
+      @name = str
+    end
-  # Does a repo exist on GitHub that matches this gem
-  def github?
-    if @is_github.nil?
-      @is_github = (self.github_like? && self.github_repo_exist?)
-    else
-      @is_github
+    # Does a repo exist on GitHub that matches this gem
+    def github?
+      if @is_github.nil?
+        @is_github = (self.github_like? && self.github_repo_exist?)
+      else
+        @is_github
+      end
     end
-  end
-  # Full name of this gem including GitHub username
-  def github_name
-    self.name if self.github_user_name
-  end
+    # Full name of this gem including GitHub username
+    def github_name
+      self.name if self.github_user_name
+    end
-  def github_like?
-    self.github_user_name && self.github_repo_name
-  end
+    def github_like?
+      self.github_user_name && self.github_repo_name
+    end
-  # Does a gem exist on Gemcutter that matches this gem
-  def gemcutter?
-    if @is_gemcutter.nil?
-      @is_gemcutter = self.gemcutter_gem_exist?
-    else
-      @is_gemcutter
+    # Does a gem exist on Gemcutter that matches this gem
+    def gemcutter?
+      if @is_gemcutter.nil?
+        @is_gemcutter = self.gemcutter_gem_exist?
+      else
+        @is_gemcutter
+      end
     end
-  end
-  # Likely name of this gem on Gemcutter (without the GitHub username)
-  def gemcutter_name
-    self.github? ? self.github_repo_name : self.name
-  end
+    # Likely name of this gem on Gemcutter (without the GitHub username)
+    def gemcutter_name
+      self.github? ? self.github_repo_name : self.name
+    end
-  # Command to install gem from Gemcutter
-  def install_cmd
-    cmd = ["gem install"]
-    cmd << self.gemcutter_name
-    cmd << "-v #{self.version}" if self.version
-    cmd.join(' ')
-  end
+    # Command to install gem from Gemcutter
+    def install_cmd
+      cmd = ["gem install"]
+      cmd << self.gemcutter_name
+      cmd << "-v #{self.version}" if self.version
+      cmd.join(' ')
+    end
-  # Command to uninstall gem
-  def uninstall_cmd
-    cmd = ["gem uninstall"]
-    cmd << self.name
-    cmd << "-v #{self.version}" if self.version
-    cmd.join(' ')
-  end
+    # Command to uninstall gem
+    def uninstall_cmd
+      cmd = ["gem uninstall"]
+      cmd << self.name
+      cmd << "-v #{self.version}" if self.version
+      cmd.join(' ')
+    end
-protected
+  protected
-  def clear
-    @is_gemcutter = @is_github = nil
-  end
+    def clear
+      @is_gemcutter = @is_github = nil
+    end
-  def github_user_name
-    if self.name =~ /^([^-]*)-.*$/
-      $1
+    def github_user_name
+      if self.name =~ /^([^-]*)-.*$/
+        $1
+      end
     end
-  end
-  def github_repo_name
-    if self.name =~ /^[^-]*-(.*)$/
-      $1
+    def github_repo_name
+      if self.name =~ /^[^-]*-(.*)$/
+        $1
+      end
     end
-  end
-  def github_uri
-    URI.parse("http://github.com/api/v2/yaml/repos/show/#{self.github_user_name}/#{self.github_repo_name}")
-  end
+    def github_uri
+      URI.parse("http://github.com/api/v2/yaml/repos/show/#{self.github_user_name}/#{self.github_repo_name}")
+    end
-  def github_repo_exist?
-    response = Net::HTTP.get(self.github_uri)
-    case
-    when response =~ /error: repository not found/
-      false
-    when response =~ /error: too many requests/
-      raise ServiceError
-    else
-      true
+    def github_repo_exist?
+      response = Net::HTTP.get(self.github_uri)
+      case
+      when response =~ /error: repository not found/
+        false
+      when response =~ /error: too many requests/
+        raise ServiceError
+      else
+        true
+      end
     end
-  end
-  def gemcutter_uri
-    URI.parse("http://gemcutter.org/api/v1/gems/#{self.name}.json")
-  end
+    def gemcutter_uri
+      URI.parse("http://gemcutter.org/api/v1/gems/#{self.name}.json")
+    end
-  def gemcutter_gem_exist?
-    response = Net::HTTP.get(self.gemcutter_uri)
-    case
-    when response =~ /This rubygem could not be found./
-      false
-    when response =~ /error: too many requests/
-      raise ServiceError
-    else
-      true
+    def gemcutter_gem_exist?
+      response = Net::HTTP.get(self.gemcutter_uri)
+      case
+      when response =~ /This rubygem could not be found./
+        false
+      when response =~ /error: too many requests/
+        raise ServiceError
+      else
+        true
+      end
     end
-  end
-  def attributes_from_one_liner(one_liner)
-    if one_liner =~ /^(.*)-([\d\.]+)$/
-      self.name = $1
-      self.version = $2
+    def attributes_from_one_liner(one_liner)
+      if one_liner =~ /^(.*)-([\d\.]+)$/
+        self.name = $1
+        self.version = $2
+      end
     end
-  end
-end
+  end
 end

data/lib/hubless.rb CHANGED Viewed

@@ -1,6 +1,10 @@
 require File.dirname(__FILE__) + '/gem_description'
 class Hubless
+  class GemInstallError < StandardError; end
   @@io = $stdout
   @@timeout = 1
@@ -55,14 +59,16 @@ class Hubless
     self.gems.each {|g| @@io.puts(g.install_cmd) if g.github? && g.gemcutter? }
   end
-  # def self.reinstall_gems
-  #   self.gems.each do |g|
-  #     if g.github? && g.gemcutter?
-  #       @@io.puts %x(#{g.uninstall_cmd})
-  #       @@io.puts %x(#{g.install_cmd})
-  #     end
-  #   end
-  # end
+  def install_gems
+    @@io.puts("\nInstalling gems:")
+    self.gems.each do |g|
+      if g.github? && g.gemcutter?
+        cmd = g.install_cmd
+        @@io.puts cmd
+        raise GemInstallError unless Kernel.system(cmd)
+      end
+    end
+  end
 protected
@@ -71,5 +77,3 @@ protected
   end
 end
-# Hubless.local_gems_on_github.each{|g| puts g.inspect }

data/test/test_application.rb CHANGED Viewed

@@ -14,4 +14,28 @@ class TestApplication < Test::Unit::TestCase
     Hubless::Application.run
   end
+  def test_run_with_i
+    hubless = mock(
+      :gem_breakdown          => true,
+      :github_repos           => true,
+      :gemcutter_gems         => true,
+      :uninstall_instructions => true,
+      :install_gems           => true
+    )
+    Hubless.expects(:new).returns(hubless)
+    Hubless::Application.run('-i')
+  end
+  def test_run_with_h
+    original_stdout = $stdout
+    fake_stdout = mock
+    fake_stdout.stubs(:write)
+    $stdout = fake_stdout
+    fake_stdout.expects(:puts).at_least_once
+    Hubless.expects(:new).never
+    Hubless::Application.run('-h')
+  ensure
+    $stdout = original_stdout
+  end
 end

data/test/test_hubless.rb CHANGED Viewed

@@ -98,99 +98,34 @@ class TestHubless < Test::Unit::TestCase
     hubless.install_instructions
   end
-  # def setup
-  #   @gems = [
-  #       [ 'my-github_and_gemcutter_gem-0.1.2', mock ],
-  #       [ 'my-github_only_gem-1.2.3', mock ],
-  #       [ 'my-github_look_a_like_on_gemcutter_gem-2.3.4', mock ],
-  #       [ 'my_non_github_gem-3.4.5', mock ]
-  #     ]
-  #   Gem.stubs(:cache).returns(@gems)
-  # end
-  #
-  # def teardown
-  #   Hubless.clear
-  # end
-  #
-  # def test_local_gems
-  #   local_gems = Hubless.local_gems
-  #   assert local_gems.detect{|gem_description| gem_description.name == 'my-github_and_gemcutter_gem' }
-  #   assert local_gems.detect{|gem_description| gem_description.name == 'my-github_only_gem' }
-  #   assert local_gems.detect{|gem_description| gem_description.name == 'my-github_look_a_like_on_gemcutter_gem' }
-  #   assert local_gems.detect{|gem_description| gem_description.name == 'my_non_github_gem' }
-  #   assert_equal @gems.length, local_gems.length
-  # end
-  #
-  # def test_local_github_like_gems
-  #   local_github_like_gems = Hubless.local_github_like_gems
-  #   assert local_github_like_gems.detect{|gem_description| gem_description.name == 'my-github_and_gemcutter_gem' }
-  #   assert local_github_like_gems.detect{|gem_description| gem_description.name == 'my-github_only_gem' }
-  #   assert local_github_like_gems.detect{|gem_description| gem_description.name == 'my-github_look_a_like_on_gemcutter_gem' }
-  #   assert ! local_github_like_gems.detect{|gem_description| gem_description.name == 'my_non_github_gem' }
-  # end
-  #
-  # def test_local_gems_on_github
-  #   Net::HTTP.expects(:get).times(3).
-  #     returns("--- \nrepository: \n  :description: Description here\n  :forks: 0\n  :url: http://github.com/some_user/some_repo\n  :fork: false\n  :open_issues: 0\n  :watchers: 1\n  :private: false\n  :name: some_repo\n  :owner: some_user\n").
-  #     returns("--- \nrepository: \n  :description: Description here\n  :forks: 0\n  :url: http://github.com/some_user/some_repo\n  :fork: false\n  :open_issues: 0\n  :watchers: 1\n  :private: false\n  :name: some_repo\n  :owner: some_user\n").
-  #     returns("--- \nerror: \n- error: repository not found\n")
-  #   local_gems_on_github = Hubless.local_gems_on_github
-  #   assert local_gems_on_github.detect{|gem_description| gem_description.name == 'my-github_and_gemcutter_gem' }
-  #   assert local_gems_on_github.detect{|gem_description| gem_description.name == 'my-github_only_gem' }
-  #   assert ! local_gems_on_github.detect{|gem_description| gem_description.name == 'my-github_look_a_like_on_gemcutter_gem' }
-  #   assert ! local_gems_on_github.detect{|gem_description| gem_description.name == 'my_non_github_gem' }
-  # end
-  #
-  # def test_local_gems_on_github_with_github_error
-  #   Net::HTTP.expects(:get).times(2).
-  #     returns("--- \nrepository: \n  :description: Description here\n  :forks: 0\n  :url: http://github.com/some_user/some_repo\n  :fork: false\n  :open_issues: 0\n  :watchers: 1\n  :private: false\n  :name: some_repo\n  :owner: some_user\n").
-  #     returns("--- \nerror: \n- error: too many requests\n")
-  #   assert_raise(ServiceError) { Hubless.local_gems_on_github }
-  # end
-  #
-  # def test_local_gems_on_github_and_gemcutter
-  #   Net::HTTP.expects(:get).times(5).
-  #     returns("--- \nrepository: \n  :description: Description here\n  :forks: 0\n  :url: http://github.com/some_user/some_repo\n  :fork: false\n  :open_issues: 0\n  :watchers: 1\n  :private: false\n  :name: some_repo\n  :owner: some_user\n").
-  #     returns("--- \nrepository: \n  :description: Description here\n  :forks: 0\n  :url: http://github.com/some_user/some_repo\n  :fork: false\n  :open_issues: 0\n  :watchers: 1\n  :private: false\n  :name: some_repo\n  :owner: some_user\n").
-  #     returns("--- \nerror: \n- error: repository not found\n").
-  #     returns(%Q{{"version_downloads":137674,"info":"    Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick\n    on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.\n","project_uri":"http://gemcutter.org/gems/rails","name":"rails","version":"2.3.5","gem_uri":"http://gemcutter.org/gems/rails-2.3.5.gem","downloads":218523,"authors":"David Heinemeier Hansson"}}).
-  #     returns("This rubygem could not be found.")
-  #   local_gems_on_github_and_gemcutter = Hubless.local_gems_on_github_and_gemcutter
-  #   assert local_gems_on_github_and_gemcutter.detect{|gem_description| gem_description.name == 'my-github_and_gemcutter_gem' }
-  #   assert ! local_gems_on_github_and_gemcutter.detect{|gem_description| gem_description.name == 'my-github_only_gem' }
-  #   assert ! local_gems_on_github_and_gemcutter.detect{|gem_description| gem_description.name == 'my-github_look_a_like_on_gemcutter_gem' }
-  #   assert ! local_gems_on_github_and_gemcutter.detect{|gem_description| gem_description.name == 'my_non_github_gem' }
-  # end
-  #
-  # def test_clear
-  #   Net::HTTP.expects(:get).times(5).
-  #     returns("--- \nrepository: \n  :description: Description here\n  :forks: 0\n  :url: http://github.com/some_user/some_repo\n  :fork: false\n  :open_issues: 0\n  :watchers: 1\n  :private: false\n  :name: some_repo\n  :owner: some_user\n").
-  #     returns("--- \nrepository: \n  :description: Description here\n  :forks: 0\n  :url: http://github.com/some_user/some_repo\n  :fork: false\n  :open_issues: 0\n  :watchers: 1\n  :private: false\n  :name: some_repo\n  :owner: some_user\n").
-  #     returns("--- \nerror: \n- error: repository not found\n").
-  #     returns(%Q{{"version_downloads":137674,"info":"    Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick\n    on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.\n","project_uri":"http://gemcutter.org/gems/rails","name":"rails","version":"2.3.5","gem_uri":"http://gemcutter.org/gems/rails-2.3.5.gem","downloads":218523,"authors":"David Heinemeier Hansson"}}).
-  #     returns("This rubygem could not be found.")
-  #
-  #   Hubless.local_gems_on_github_and_gemcutter
-  #
-  #   Net::HTTP.expects(:get).times(0)
-  #
-  #   Hubless.local_gems_on_github_and_gemcutter
-  #
-  #   Hubless.clear
-  #
-  #   Net::HTTP.expects(:get).times(5).
-  #     returns("--- \nrepository: \n  :description: Description here\n  :forks: 0\n  :url: http://github.com/some_user/some_repo\n  :fork: false\n  :open_issues: 0\n  :watchers: 1\n  :private: false\n  :name: some_repo\n  :owner: some_user\n").
-  #     returns("--- \nrepository: \n  :description: Description here\n  :forks: 0\n  :url: http://github.com/some_user/some_repo\n  :fork: false\n  :open_issues: 0\n  :watchers: 1\n  :private: false\n  :name: some_repo\n  :owner: some_user\n").
-  #     returns("--- \nerror: \n- error: repository not found\n").
-  #     returns(%Q{{"version_downloads":137674,"info":"    Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick\n    on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.\n","project_uri":"http://gemcutter.org/gems/rails","name":"rails","version":"2.3.5","gem_uri":"http://gemcutter.org/gems/rails-2.3.5.gem","downloads":218523,"authors":"David Heinemeier Hansson"}}).
-  #     returns("This rubygem could not be found.")
-  #
-  #   Hubless.local_gems_on_github_and_gemcutter
-  # end
-def test_nothin
-  assert true
-end
+  def test_install_gems
+    local_gems = [
+        mock(:install_cmd => 'foo', :github? => true, :gemcutter? => true),
+        mock(:install_cmd => 'bar', :github? => true, :gemcutter? => true),
+        mock(:install_cmd => 'abc', :github? => true, :gemcutter? => true),
+        mock(:github? => true, :gemcutter? => false),
+        mock(:github? => false)
+      ]
+    Hubless::GemDescription.expects(:local_gems).once.returns(local_gems)
+    @io.expects(:puts).with{|s| s =~ /Installing gems:/ }
+    @io.expects(:puts).once.with{|s| s =~ /foo/ }
+    @io.expects(:puts).once.with{|s| s =~ /bar/ }
+    @io.expects(:puts).once.with{|s| s =~ /abc/ }
+    Kernel.expects(:system).once.with{|s| s =~ /foo/ }.returns(true)
+    Kernel.expects(:system).once.with{|s| s =~ /bar/ }.returns(true)
+    Kernel.expects(:system).once.with{|s| s =~ /abc/ }.returns(true)
+    hubless = Hubless.new
+    hubless.install_gems
+    local_gems = [
+        mock(:install_cmd => 'foo', :github? => true, :gemcutter? => true)
+      ]
+    Hubless::GemDescription.expects(:local_gems).once.returns(local_gems)
+    @io.expects(:puts).with{|s| s =~ /Installing gems:/ }
+    @io.expects(:puts).once.with{|s| s =~ /foo/ }
+    Kernel.expects(:system).once.with{|s| s =~ /foo/ }.returns(false)
+    hubless = Hubless.new
+    assert_raise(Hubless::GemInstallError) { hubless.install_gems }
+  end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubless
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Greg Sterndale