gemline 0.1.2 → 0.1.3

data/gemline.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.name          = "gemline"
   gem.require_paths = ["lib"]
 
-  gem.version       = '0.1.2'
+  gem.version       = '0.1.3'
 
 	gem.add_dependency('crack')
 	gem.add_development_dependency('rake') # For Travis CI

data/lib/gemline.rb

@@ -15,8 +15,8 @@ class Gemline
     g = Gemline.new(gem_name)
     
     if g.gem_not_found?
-      puts "Ruby gem #{gem_name} was not found on rubygems.org"
-      exit
+      $stderr.puts "Ruby gem #{gem_name} was not found on rubygems.org"
+      Kernel.exit 1
     else
       puts g.gemline
       copy_to_clipboard(g.gemline)
@@ -24,12 +24,12 @@ class Gemline
   end
 
 
-  def initialize(gem_name)
+  def initialize(gem_name, options = {})
     @gem = gem_name.to_s.gsub(/[^\w\-]+/,'') # Yeah, a little over-defensive.
     @json = Gemline.get_rubygem_json(@gem)
     unless gem_not_found?
       @response = Crack::JSON.parse(@json)
-      @gemline = Gemline.create_gemline(@gem, response['version'])
+      @gemline = Gemline.create_gemline(@gem, response['version'], options)
     end
   end
 
@@ -44,15 +44,28 @@ class Gemline
     Net::HTTP.get(URI.parse("http://rubygems.org/api/v1/gems/#{gem_name}.json"))
   end  
 
-  def self.create_gemline(gem_name, version)
+  def self.create_gemline(gem_name, version, options = {})
+    if options[:gemspec]
+      return gemspec_gemline(gem_name, version)
+    else
+      return gemfile_gemline(gem_name, version)
+    end
+  end
+
+  def self.gemfile_gemline(gem_name, version)
     %Q{gem "#{gem_name}", "~> #{version}"}  
   end
 
+  def self.gemspec_gemline(gem_name, version)
+    %Q{gem.add_dependency(%q<#{gem_name}>, ["~> #{version}"])}  
+  end
+
+
   def self.check_input(gem_name)
     if (gem_name.empty? || ['-h','--help','help'].include?(gem_name))
-      puts "Usage: gemline [GEM NAME]"
-      puts "  Prints a Gemfile require line for a Ruby gem on Rubygems.org"
-      exit
+      $stderr.puts "Usage: gemline [GEM NAME]"
+      $stderr.puts "  Prints a Gemfile require line for a Ruby gem on Rubygems.org"
+      Kernel.exit 1
     end
     
     # if (['-v','--version'].include?(gem_name))
@@ -65,7 +78,7 @@ class Gemline
     begin
       if clipboard = IO.popen('pbcopy', 'r+')
         clipboard.puts gemline
-        puts "  Gem line copied to your clipboard.  Ready to paste into your Gemfile"
+        $stderr.puts "  Gem line copied to your clipboard.  Ready to paste into your Gemfile"
       end
     rescue
       ## Yeah, I hate this too.  But it does what I want -- silently fail if pbcopy isn't available.

data/spec/acceptance_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'stringio'
+
+describe "gemline output" do
+
+  before do     
+    stub_rubygems_json_output
+  end
+
+  it "should output one line to STDOUT so the output can be appended to a Gemfile" do
+    grab_io { Gemline.query('rails') }
+    @stdout.readlines.count.should eq(1)
+  end
+
+  it "should output nothing to STDOUT on error" do
+    Kernel.stub(:exit)
+    grab_io { Gemline.query('doesnotexist') }
+    @stdout.readlines.count.should eq(0)
+  end
+
+end

data/spec/gemline_spec.rb

@@ -5,10 +5,7 @@ describe Gemline do
   describe "querying rubygems" do
 
     before do     
-      Dir.glob(File.join(File.dirname(__FILE__),'samples', '*.json')).each do |f|
-        gem_name = $1 if f =~ /\/([\w\-]+).json$/
-        Gemline.stub!(:get_rubygem_json).with(gem_name).and_return(IO.read(f))
-      end
+      stub_rubygems_json_output
     end
 
     it "should be able to parse the version out of a good json string" do
@@ -32,6 +29,12 @@ describe Gemline do
       g = Gemline.new('nokogiri')
       g.gemline.should == %Q{gem "nokogiri", "~> 1.5.5"}
     end
+
+    it "should be able to generate a gemspec-style gemline" do
+      g = Gemline.new('rails', :gemspec => true)
+      g.gemline.should == %Q!gem.add_dependency(%q<rails>, ["~> 3.1.1"])!
+    end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -11,3 +11,23 @@ Bundler.setup
 RSpec.configure do |c|
 
 end
+
+
+def stub_rubygems_json_output
+  Dir.glob(File.join(File.dirname(__FILE__),'samples', '*.json')).each do |f|
+    gem_name = $1 if f =~ /\/([\w\-]+).json$/
+    Gemline.stub!(:get_rubygem_json).with(gem_name).and_return(IO.read(f))
+  end
+end
+
+def grab_io
+  @stdout = StringIO.new; $stdout = @stdout;
+  @stderr = StringIO.new; $stderr = @stderr;
+
+  yield
+
+  @stdout.rewind; @stderr.rewind;
+
+  $stdout = STDOUT
+  $stderr = STDERR
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemline
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
@@ -75,6 +75,7 @@ files:
 - bin/gemline
 - gemline.gemspec
 - lib/gemline.rb
+- spec/acceptance_spec.rb
 - spec/gemline_spec.rb
 - spec/samples/doesnotexist.json
 - spec/samples/nokogiri.json
@@ -93,18 +94,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1346520356031458065
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1346520356031458065
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -112,6 +107,7 @@ signing_key:
 specification_version: 3
 summary: ''
 test_files:
+- spec/acceptance_spec.rb
 - spec/gemline_spec.rb
 - spec/samples/doesnotexist.json
 - spec/samples/nokogiri.json