gemline 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 742ba3f7b6e6f8c491852c705d2236c660e290e1
-  data.tar.gz: 4c37e3b817a1b70cf4729fdde93971cb9e6b9e5e
+SHA256:
+  metadata.gz: a5267ceb6e55d48145e02397d570f6bcba1a2e73c29f482cbbefd5bcfec19032
+  data.tar.gz: 78c7cc5acc3f5bfbbe3d7bfea96bded6193e56e87591794b73a5108c80c9f4c4
 SHA512:
-  metadata.gz: 167098e6467eb8f334de634f43669e740db75a941a8ff4fd15aca1f8d6cb7a8fb076fb355dd85d4fe1daeaf208583712d566cb4bed7bf314a939818e16bb3d0d
-  data.tar.gz: d36d9034de9bd6ec703bbe3cc0d88b787db76fe7cbe84472fc4ff84c555b9579fdba7921af300432fe2b9b5d780707c83418f906f42aff619b9a7dc86227a1d6
+  metadata.gz: 8199ca68fa9676c2da383c217918b951b16d33be0ff144b6f995fb545d2ffe8e9fe1b71e761e103ea18d831ce8e538fa62aa97d22f469b7c0184ee57e09a9e62
+  data.tar.gz: d473981898b5b6685bd664f8d5d23e3c45622da4b02f3d93ade2ec99741a53b0ac0c6463d26288c8737efefee9f0d15b60b3bfbed6a7b7a7b0758a6767363170

data/.github/workflows/tests.yml

@@ -0,0 +1,32 @@
+name: Ruby CI
+
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'README.rdoc'
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - 'README.rdoc'
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    if: "contains(github.event.commits[0].message, '[ci skip]') == false"
+
+    strategy:
+      matrix:
+        ruby: [3.4.1, 3.3.6, 3.2.6, 2.7.8]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Test
+        run: bundle exec rake spec

data/Rakefile

@@ -6,10 +6,10 @@ require 'rspec/core/rake_task'
 Bundler::GemHelper.install_tasks
 
 desc 'Default: Run specs'
-task :default => :spec
+task default: :spec
 
 desc 'Run specs'
 RSpec::Core::RakeTask.new(:spec)
 
 desc 'Run specs (alias for Gem Testers)'
-task :test => :spec
+task test: :spec

data/bin/gemline

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "gemline"
-require 'optparse'
+require "optparse"
 
 ## TODO: Real command line parsing to support some switches
 ##   for things like:
@@ -33,7 +33,7 @@ OptionParser.new do |opts|
   end
 
   opts.on("-v", "--version") do
-    puts "gemline #{Gem::Specification::load("gemline.gemspec").version}"
+    puts "gemline #{Gem::Specification.load("gemline.gemspec").version}"
     exit
   end
 

data/gemline.gemspec

@@ -3,20 +3,20 @@
 Gem::Specification.new do |gem|
   gem.authors       = ["Joe Alba"]
   gem.email         = ["joe@joealba.com"]
-  gem.description   = %q{Grab the latest Gemfile 'gem' line for a specific Ruby gem}
-  gem.summary       = %q{}
+  gem.description   = "Grab the latest Gemfile dependency designation for a specific Ruby gem"
+  gem.summary       = ""
   gem.homepage      = "https://github.com/joealba/gemline"
 
-  gem.executables   = ['gemline']
+  gem.executables   = ["gemline"]
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "gemline"
   gem.require_paths = ["lib"]
 
-  gem.version       = '0.4.4'
-  gem.license       = 'MIT'
+  gem.version       = "0.5.0"
+  gem.license       = "MIT"
 
-  gem.add_dependency "clipboard", ">= 1.0.1"
+  gem.add_dependency "clipboard", ">= 1.3.5"
 
   # if RUBY_PLATFORM =~ /(win|w)32$/
     ## The clipboard gem doesn't do a platform-dependent check,
@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
     gem.add_dependency "ffi"
   # end
 
-	gem.add_development_dependency "rake" # For Travis CI
-  gem.add_development_dependency "rspec", ">= 3.3.0"
-  gem.add_development_dependency "simplecov", ">= 0.7.1"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec", ">= 3.0"
+  gem.add_development_dependency "simplecov"
 end

data/lib/gemline/rubygems.rb

@@ -0,0 +1,12 @@
+class Gemline
+  class Rubygems
+    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)
+      http.use_ssl = true
+      request = Net::HTTP::Get.new(uri.request_uri)
+      response = http.request(request)
+      response.body
+    end
+  end
+end

data/lib/gemline.rb

@@ -1,6 +1,8 @@
-require 'net/https'
-require 'clipboard'
-require 'json'
+require "net/https"
+require "clipboard"
+require "json"
+
+require_relative "./gemline/rubygems"
 
 class Gemline
   attr_accessor :gem, :gemline, :json, :response
@@ -19,71 +21,66 @@ class Gemline
 
   def initialize(gem_name, options = {})
     @gem = sanitize_gem_name(gem_name)
-    @json = Gemline.get_rubygem_json(@gem)
+    @json = Gemline::Rubygems.get_rubygem_json(@gem)
     unless gem_not_found?
       @response = JSON.parse(@json)
-      @gemline = Gemline.create_gemline(@gem, response['version'], options)
+      @gemline = Gemline.create_gemline(@gem, response["version"], options)
     end
   end
 
   def sanitize_gem_name(gem_name)
-    gem_name.to_s.gsub(/[^\w\-]+/,'') # Yeah, a little over-defensive.
+    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
 
+  def self.options_to_string(options = {})
+    if options[:group]
+      options[:group] = [options[:group]].flatten.map(&:to_sym)
+      options[:group] = options[:group].first if options[:group].length == 1
+    end
 
-  private
+    options.map { |k, v| "#{k}: #{value_to_string(v)}" }.join(", ")
+  end
 
-  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)
-    http.use_ssl = true
-    # http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Get.new(uri.request_uri)
-    response = http.request(request)
-    response.body
+  def self.value_to_string(val)
+    case val
+    when Array
+      val.to_s
+    when Symbol
+      ":#{val}"
+    when String
+      "\"#{val}\""
+    end
   end
 
   def self.create_gemline(gem_name, version, options)
     if options[:gemspec]
-      return gemspec_gemline(gem_name, version, options)
+      gemspec_gemline(gem_name, version, options)
     else
-      return gemfile_gemline(gem_name, version, options.delete_if {|k,v| k == :gemspec})
+      gemfile_gemline(gem_name, version, options.delete_if { |k, _| k == :gemspec })
     end
   end
 
   def self.gemfile_gemline(gem_name, version, options)
-    line = %Q{gem "#{gem_name}", "~> #{version}"}
-    line << ", " + options_to_string(options) if !options.empty?
-    line
+    %Q{gem "#{gem_name}", "~> #{version}"#{gemfile_gemline_options_suffix(options)}}
   end
 
-  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)/, ' => ')
+  def self.gemfile_gemline_options_suffix(options)
+    !options.empty? ? ", " + options_to_string(options) : ""
   end
 
   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
+    dependency_signifier = options[:group]&.include?('development') ? "add_development_dependency" : "add_dependency"
+    %Q{gem.#{dependency_signifier} "#{gem_name}", "~> #{version}"}
   end
 
   def self.copy_to_clipboard(gemline)
-    begin
-      Clipboard.copy gemline
-      $stderr.puts "  Gem line copied to your clipboard.  Ready to paste into your Gemfile"
-    rescue
-      ## Yeah, I hate this too.  But it does what I want -- silently fail if Clipboard fails.
-    end
+    Clipboard.copy gemline
+    $stderr.puts "  Gem line copied to your clipboard.  Ready to paste into your Gemfile"
+  rescue
+    ## Yeah, I hate this too.  But it does what I want -- silently fail if Clipboard fails.
   end
-
 end

data/spec/acceptance_spec.rb

@@ -1,21 +1,19 @@
-require 'spec_helper'
-require 'stringio'
+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') }
+    grab_io { Gemline.query("rails") }
     expect(@stdout.readlines.count).to eq(1)
   end
 
   it "should output nothing to STDOUT on error" do
     allow(Kernel).to receive(:exit).and_return(true)
-    grab_io { Gemline.query('doesnotexist') }
+    grab_io { Gemline.query("doesnotexist") }
     expect(@stdout.readlines.count).to eq(0)
   end
-
 end

data/spec/gemline_spec.rb

@@ -1,82 +1,79 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Gemline do
-
   describe "querying rubygems" do
-
     before do
       stub_rubygems_json_output
     end
 
     it "should be able to parse the version out of a good json string" do
-      g = Gemline.new('rails')
+      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 = Gemline.new("doesnotexist")
       expect(g.gem_not_found?).to eq true
       expect(g.gemline).to eq nil
     end
 
     it "should properly detect a blocked gem name" do
-      g = Gemline.new('yaml')
+      g = Gemline.new("yaml")
       expect(g.gem_not_found?).to eq true
       expect(g.gemline).to eq nil
     end
 
     it "should properly handle funny characters in the returned JSON" do
-      g = Gemline.new('nokogiri')
+      g = Gemline.new("nokogiri")
       expect(g.gemline).to eq(%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.new("rails", gemspec: true)
       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'})
+        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'})
+        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]})
+      g = Gemline.new("nokogiri", { git: "some git repo", group: %i[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]})
+      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
+  describe "helper methods" do
+    describe "#options_to_string" do
       it "returns nothing when no options provided" do
-        expect(Gemline.options_to_string).to eq ''
+        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'
+        it "handles a single group passed 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'
+        it "handles a single group passed 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]'
+        it "handles a list of groups passed as symbols" do
+          expect(Gemline.options_to_string(group: %i[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]'
+        it "handles a list of groups passed as strings" do
+          expect(Gemline.options_to_string(group: %w[development test])).to eq "group: [:development, :test]"
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,29 +1,21 @@
-if RUBY_VERSION >= '1.9'
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter "/spec/"
-  end
+require "simplecov"
+SimpleCov.start do
+  add_filter "/spec/"
 end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'rubygems'
-require 'gemline'
-
-require 'bundler'
-Bundler.setup
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
+require "gemline"
 
 RSpec.configure do |c|
   # c.mock_with :rr
 end
 
-
 def stub_rubygems_json_output
-  Dir.glob(File.join(File.dirname(__FILE__),'samples', '*.json')).each do |f|
+  Dir.glob(File.join(File.dirname(__FILE__), "samples", "*.json")).each do |f|
     gem_name = $1 if f =~ /\/([\w\-]+).json$/
-    allow(Gemline).to receive(:get_rubygem_json).with(gem_name).and_return(IO.read(f))
+    allow(Gemline::Rubygems).to receive(:get_rubygem_json).with(gem_name).and_return(IO.read(f))
   end
 end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gemline
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Joe Alba
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2025-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -58,29 +57,29 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   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
+        version: '0'
+description: Grab the latest Gemfile dependency designation for a specific Ruby gem
 email:
 - joe@joealba.com
 executables:
@@ -88,15 +87,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - README.rdoc
 - Rakefile
 - bin/gemline
 - gemline.gemspec
 - lib/gemline.rb
+- lib/gemline/rubygems.rb
 - spec/acceptance_spec.rb
 - spec/gemline_spec.rb
 - spec/samples/doesnotexist.json
@@ -108,7 +108,6 @@ homepage: https://github.com/joealba/gemline
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -123,9 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: ''
 test_files:

data/.travis.yml

@@ -1,6 +0,0 @@
-rvm:
-  - 1.9.3
-  - 2.1.8
-  - 2.2.4
-  - jruby-19mode
-  - ruby-head