gemline 0.3.2 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 40c67d8b6da4db9e5c1e72ec503472e777ffb236
+  data.tar.gz: bfed976a867e9dbaa5ebf34ef6bb3adf8d594ecc
+SHA512:
+  metadata.gz: 81b9ece9c9252124be218de2b1fab46f584f3925bd3b044ca495c8a49f805825d0c94bd91a171a55a6f16dc37dba50f09421a1288fd58eb4b7e2804fe700f370
+  data.tar.gz: 05714764adb0dd2e420989e23e5a60afdf2b4f52a91b6b13b9db29b13b3dfbbed126f74666117d0f50e0f599726dbfac6bb4c33cf7df3e6a2a098dea3083622c

data/.rspec

@@ -0,0 +1 @@
+--color

data/README.rdoc

@@ -4,12 +4,40 @@ Create a tilde-arrow Gemfile line for a gem on rubygems.org using the latest ver
 
 If possible, we'll also copy that Gemfile line into the clipboard using pbcopy.
 
-== Example
+== Examples
+
+=== Normal Gemfile usage
 
   # gemline rails
-  gem "rails", "~> 3.1.1"
+  gem "rails", "~> 4.0.1"
+    Gem line copied to your clipboard.  Ready to paste into your Gemfile
+
+=== Including group designation
+
+  # gemline rails --group development,test
+  gem "rails", "~> 4.0.1", :group => [:development, :test]
     Gem line copied to your clipboard.  Ready to paste into your Gemfile
 
+=== Append your Gemfile
+
+  # gemline rails >> Gemfile
+
+=== Gemspec style
+
+  # gemline rails -g
+  gem.add_dependency "rails", "~> 4.0.1"
+    Gem line copied to your clipboard.  Ready to paste into your Gemfile
+
+  # gemline rails -g --group development
+  gem.add_development_dependency "rails", "~> 4.0.1"
+    Gem line copied to your clipboard.  Ready to paste into your Gemfile
+
+=== Gemline -- It's not just for the command line anymore.  You can use it in your bootstrapping code too.
+
+  require 'gemline'
+  puts Gemline.new('rails').gemline
+  puts Gemline.new('rails', :group => :development).gemline
+
 == Install
 
   # gem install gemline
@@ -22,5 +50,4 @@ If possible, we'll also copy that Gemfile line into the clipboard using pbcopy.
 
 * A --pre option to grab the latest prerelease version
 * An --open option to open the gem's rubygems.org page in the default browser
-* Switching to a real command line parser instead of the lazy code in place now to allow the addition of the above options
 

data/bin/gemline

@@ -1,13 +1,49 @@
 #!/usr/bin/env ruby
 
 require "gemline"
+require 'optparse'
 
 ## TODO: Real command line parsing to support some switches
 ##   for things like:
 ##   --pre : Get latest pre-release version
-##   --gemspec or -g : Get the gemspec version of the gemline
 ##   --major N : Get latest version of gem within the given major release number
 ##   --web or -w : Get rubygems.org link
+
+def self.help_message
+  puts "Usage: gemline [GEM NAME]"
+  puts "  Prints a Gemfile require line for a Ruby gem on Rubygems.org"
+  exit
+end
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: gemline gem_name [options]"
+
+  opts.on("--gemspec", "-g") do |g|
+    options[:gemspec] = g
+  end
+
+  opts.on("--group x,y,z", Array) do |group|
+    group = group[0] if group.size == 1
+    options[:group] = group
+  end
+
+  opts.on("--git x", String) do |git|
+    options[:git] = git
+  end
+
+  opts.on("-v", "--version") do
+    puts "gemline #{Gem::Specification::load("gemline.gemspec").version}"
+    exit
+  end
+
+  opts.on("-h", "--help", "help") do
+    help_message
+  end
+end.parse!
+
 gem = STDIN.tty? ? ARGV[0] : STDIN.read
 
-Gemline.query(gem)
+help_message unless gem
+
+Gemline.query(gem, options)

data/gemline.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.name          = "gemline"
   gem.require_paths = ["lib"]
 
-  gem.version       = '0.3.2'
+  gem.version       = '0.4.0'
 
   gem.add_dependency "json_pure", ">= 1.7.6"
   gem.add_dependency "clipboard", ">= 1.0.1"
@@ -25,5 +25,6 @@ Gem::Specification.new do |gem|
   # end
 
 	gem.add_development_dependency "rake" # For Travis CI
-  gem.add_development_dependency "rspec", ">= 2.11.0"
+  gem.add_development_dependency "rspec", ">= 2.14.0"
+  gem.add_development_dependency "simplecov", "~> 0.7.1"
 end

data/lib/gemline.rb

@@ -5,11 +5,8 @@ require 'clipboard'
 class Gemline
   attr_accessor :gem, :gemline, :json, :response
 
-  def self.query(gem_name)
-    gem_name = sanitize_gem_name(gem_name)
-    check_input(gem_name)
-
-    g = Gemline.new(gem_name)
+  def self.query(gem_name, options = {})
+    g = Gemline.new(gem_name, options)
 
     if g.gem_not_found?
       $stderr.puts "Ruby gem #{gem_name} was not found on rubygems.org"
@@ -20,13 +17,8 @@ class Gemline
     end
   end
 
-  def self.sanitize_gem_name(gem_name)
-    gem_name.to_s.gsub(/[^\w\-]+/,'')
-  end
-
-
   def initialize(gem_name, options = {})
-    @gem = gem_name.to_s.gsub(/[^\w\-]+/,'') # Yeah, a little over-defensive.
+    @gem = sanitize_gem_name(gem_name)
     @json = Gemline.get_rubygem_json(@gem)
     unless gem_not_found?
       @response = JSON.parse(@json)
@@ -34,13 +26,17 @@ class Gemline
     end
   end
 
+  def sanitize_gem_name(gem_name)
+    gem_name.to_s.gsub(/[^\w\-]+/,'') # Yeah, a little over-defensive.
+  end
+
   def gem_not_found?
     @json.match(/(could not be found|does not exist)/)
   end
-  
-  
+
+
   private
-  
+
   def self.get_rubygem_json(gem_name)
     uri = URI.parse("https://rubygems.org/api/v1/gems/#{gem_name}.json")
     http = Net::HTTP.new(uri.host, uri.port)
@@ -51,34 +47,34 @@ class Gemline
     response.body
   end
 
-  def self.create_gemline(gem_name, version, options = {})
+  def self.create_gemline(gem_name, version, options)
     if options[:gemspec]
-      return gemspec_gemline(gem_name, version)
+      return gemspec_gemline(gem_name, version, options)
     else
-      return gemfile_gemline(gem_name, version)
+      return gemfile_gemline(gem_name, version, options.delete_if {|k,v| k == :gemspec})
     end
   end
 
-  def self.gemfile_gemline(gem_name, version)
-    %Q{gem "#{gem_name}", "~> #{version}"}  
+  def self.gemfile_gemline(gem_name, version, options)
+    line = %Q{gem "#{gem_name}", "~> #{version}"}
+    line << ", " + options_to_string(options) if !options.empty?
+    line
   end
 
-  def self.gemspec_gemline(gem_name, version)
-    %Q{gem.add_dependency "#{gem_name}", ">= #{version}"}
+  def self.options_to_string(options = {})
+    if options[:group]
+      options[:group] = [options[:group]].flatten.map { |x| x.to_sym }
+      options[:group] = options[:group].first if options[:group].length == 1
+    end
+    options.inspect.delete('{}').gsub(/(?!\s)=>(?!\s)/, ' => ')
   end
 
-
-  def self.check_input(gem_name)
-    if (gem_name.empty? || ['-h','--help','help'].include?(gem_name))
-      $stderr.puts "Usage: gemline [GEM NAME]"
-      $stderr.puts "  Prints a Gemfile require line for a Ruby gem on Rubygems.org"
-      Kernel.exit 1
+  def self.gemspec_gemline(gem_name, version, options)
+    if options[:group] && options[:group].include?('development')
+      %Q{gem.add_development_dependency "#{gem_name}", "~> #{version}"}
+    else
+      %Q{gem.add_dependency "#{gem_name}", "~> #{version}"}
     end
-    
-    # if (['-v','--version'].include?(gem_name))
-    #   puts "gemline #{Gemline::VERSION}"
-    #   exit
-    # end
   end
 
   def self.copy_to_clipboard(gemline)

data/spec/gemline_spec.rb

@@ -4,7 +4,7 @@ describe Gemline do
 
   describe "querying rubygems" do
 
-    before do     
+    before do
       stub_rubygems_json_output
     end
 
@@ -12,7 +12,7 @@ describe Gemline do
       g = Gemline.new('rails')
       expect(g.gemline).to eq(%Q{gem "rails", "~> 3.1.1"})
     end
-    
+
     it "should whine when the gem you are querying does not exist" do
       g = Gemline.new('doesnotexist')
       g.gem_not_found?.should be_true
@@ -32,9 +32,54 @@ describe Gemline do
 
     it "should be able to generate a gemspec-style gemline" do
       g = Gemline.new('rails', :gemspec => true)
-      expect(g.gemline).to eq(%Q!gem.add_dependency "rails", ">= 3.1.1"!)
+      expect(g.gemline).to eq(%Q!gem.add_dependency "rails", "~> 3.1.1"!)
+    end
+
+    describe "generates a development gemspec-style gemline" do
+      it "works when just passed the development group" do
+        g = Gemline.new('nokogiri', {:gemspec => true, :group => 'development'})
+        expect(g.gemline).to eq(%Q!gem.add_development_dependency "nokogiri", "~> 1.5.5"!)
+      end
+      it "works when passed other groups also" do
+        g = Gemline.new('nokogiri', {:gemspec => true, :group => 'development,test'})
+        expect(g.gemline).to eq(%Q!gem.add_development_dependency "nokogiri", "~> 1.5.5"!)
+      end
     end
 
+    it "should be able to add options to a gemfile-style gemline" do
+      g = Gemline.new('nokogiri', {:git => "some git repo", :group => [:development, :test]})
+      line = g.gemline
+      expect(line).to start_with(%Q{gem "nokogiri", "~> 1.5.5", })
+      expect(line).to include(%Q{:git => "some git repo"})
+      expect(line).to include(%Q{:group => [:development, :test]})
+    end
+
+  end
+
+  describe 'helper methods' do
+    describe '#options_to_string' do
+      it "returns nothing when no options provided" do
+        expect(Gemline.options_to_string).to eq ''
+      end
+
+      describe "gem groups" do
+        it "handles a single group as a symbol" do
+          expect(Gemline.options_to_string :group => :development).to eq ':group => :development'
+        end
+
+        it "handles a single group as a string" do
+          expect(Gemline.options_to_string :group => 'development').to eq ':group => :development'
+        end
+
+        it "handles a list of groups as symbols" do
+          expect(Gemline.options_to_string :group => [:development, :test]).to eq ':group => [:development, :test]'
+        end
+
+        it "handles a list of groups as strings" do
+          expect(Gemline.options_to_string :group => ['development','test']).to eq ':group => [:development, :test]'
+        end
+      end
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -1,3 +1,10 @@
+if RUBY_VERSION >= '1.9'
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/spec/"
+  end
+end
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
@@ -16,7 +23,7 @@ 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))
+    Gemline.stub(:get_rubygem_json).with(gem_name).and_return(IO.read(f))
   end
 end
 

metadata

@@ -1,96 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: gemline
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Joseph Alba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.6
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 description: Grab the latest Gemfile 'gem' line for a specific Ruby gem
 email:
 - joe@joealba.com
@@ -100,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - README.rdoc
@@ -116,33 +120,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/joealba/gemline
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -748514071157106513
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -748514071157106513
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ''
 test_files:
 - spec/acceptance_spec.rb