annotate_gem 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e0ee9922534ca6c7e763fd617f8e81a461ff4e1
-  data.tar.gz: d60f74fff3ca5131bd5beacbc7729435a973ab01
+  metadata.gz: 047f6b2c6f2fb2d56e8fde53ba869c87000697b6
+  data.tar.gz: f98ae9c02b0f80371fca64018519ceb587ed1e39
 SHA512:
-  metadata.gz: 3323eb1ba24e40ca46fb3f75c4ccb72ead72c4c9279fcebe841ee24b7de4eb51af7aa0fd3dd162d2367da6f6e3ea74aabb5c2748bf41cecff5e8d3a92b2c166c
-  data.tar.gz: cbb7b96c3789ff8123299bc315742c727521b1f9eee40abf53c9f3078a4b1033b3ca19e9ae16e9820093cb8fc901c3694448bea26207293df302dc830c9a40ad
+  metadata.gz: bc0f28fcfa956836ff846c9fcde3fa39fb3d98834a8910aabdc1c3c140895cc1b0acb105b8fc9ed25cd49c414dabd4dd56501135c966ba732267f1a16511a661
+  data.tar.gz: dda56b77cfe1b700581bb1be90e94e733fd1845c3d4c5c38be965decdda5d3932a4ef1eaee2c7e9b3961a5733a4e72289f7a36abe60f683599a693447f325db6

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+before_install: gem install bundler -v $BUNDLER_VERSION
+install: bundle _${BUNDLER_VERSION}_ install --jobs=3 --retry=3
+script: bundle _${BUNDLER_VERSION}_ exec rake test
+matrix:
+  include:
+    - rvm: 2.2
+      env: BUNDLER_VERSION=1.12.1
+    - rvm: 2.2
+      env: BUNDLER_VERSION=1.5.3
+    - rvm: 1.9
+      env: BUNDLER_VERSION=1.12.1
+    - rvm: 1.9
+      env: BUNDLER_VERSION=1.5.3

data/README.md

@@ -1,6 +1,9 @@
+[![Build Status](https://travis-ci.org/ivantsepp/annotate_gem.svg?branch=master)](https://travis-ci.org/ivantsepp/annotate_gem)
+[![Gem Version](https://badge.fury.io/rb/annotate_gem.svg)](https://badge.fury.io/rb/annotate_gem)
+
 # AnnotateGem
 
-`annotate_gem` is command line tool that will add useful comments to your Gemfile. For each gem, `annotate_gem` will create a comment with the gem's description and the gem's website. For example, a Gemfile containing the following
+`annotate-gem` is command line tool that will add useful comments to your Gemfile. For each gem, `annotate-gem` will create a comment with the gem's description and the gem's website. For example, a Gemfile containing the following
 
 ```ruby
 gem "rails"
@@ -19,9 +22,9 @@ gem "nokogiri"
 gem "brakeman"
 ```
 
-The motivation for `annotate_gem` is that developers often open a Gemfile and not know what many of the listed gems are actually for. It's hard to track down which gem is providing which functionality. This is a common problem since many gem names do not reflect the actual feature.
+The motivation for `annotate-gem` is that developers often open a Gemfile and not know what many of the listed gems are actually for. It's hard to track down which gem is providing which functionality. This is a common problem since many gem names do not reflect the actual feature.
 
-If you do _not_ want to install the gem, you can also visit <https://annotate_gem.herokuapp.com/> which is a web interface for `annotate_gem`.
+If you do _not_ want to install the gem, you can also visit <https://annotate-gem.herokuapp.com/> which is a web interface for `annotate-gem`.
 
 ## Installation
 
@@ -31,23 +34,23 @@ $ gem install annotate_gem
 
 ## Usage
 
-Running `annotate_gem` itself will add comments to the current directory's `Gemfile`.
+Running `annotate-gem` itself will add comments to the current directory's `Gemfile`.
 
 ```
 $ cat Gemfile
 source 'https://rubygems.org'
 gem "pry"
-$ annotate_gem
+$ annotate-gem
 $ cat Gemfile
 source 'https://rubygems.org'
 # An IRB alternative and runtime developer console (http://pryrepl.org)
 gem "pry"
 ```
 
-`annotate_gem` has several options and you can see them via `annotate_gem -h`. `annotate_gem` also works with specifying a single gem name:
+`annotate-gem` has several options and you can see them via `annotate-gem -h`. `annotate-gem` also works with specifying a single gem name:
 
 ```
-$ annotate_gem aasm
+$ annotate-gem aasm
 State machine mixin for Ruby objects (https://github.com/aasm/aasm)
 ```
 

data/Rakefile

@@ -6,3 +6,5 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['test/**/*test.rb']
   t.verbose = true
 end
+
+task :default => :test

data/annotate_gem.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "bundler", "~> 1.11.2"
+  spec.add_runtime_dependency "bundler", "~> 1.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "mocha", "~> 1.1"

data/bin/annotate-gem

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.join(File.dirname(__FILE__), "../lib"))
+
+require "annotate_gem/cli"
+require "annotate_gem"
+
+AnnotateGem::CLI.new.run(ARGV)

data/lib/annotate_gem/spec_finder.rb

@@ -21,11 +21,8 @@ module AnnotateGem
       total = gem_lines.length
       processing = 0
       yield processing, total if block_given?
-      # TODO: Support private sources
-      remote = Bundler::Source::Rubygems::Remote.new(Gem.sources.first.uri)
-      fetcher = Bundler::Fetcher.new(remote)
-      dependency_fetcher = fetcher.fetchers.find {|f| Bundler::Fetcher::Dependency === f }
-      versions, _ = dependency_fetcher.dependency_specs(gem_lines.collect(&:name))
+      fetcher = bundler_fetcher
+      versions = get_versions(fetcher, gem_lines.collect(&:name))
       gem_lines.each do |gem_line|
         processing += 1
         yield processing, total if block_given?
@@ -39,5 +36,33 @@ module AnnotateGem
     def find_latest_version(versions)
        versions.sort_by { |v| v[1] }.last[1]
     end
+
+    private
+
+    # TODO: Support private sources
+    def bundler_fetcher
+      # Bundler versions 1.10.0 moves AnonymizableURI to Source::Rubygems::Remote
+      # See https://github.com/bundler/bundler/pull/3476
+      if defined?(Bundler::Source::Rubygems::Remote)
+        remote = Bundler::Source::Rubygems::Remote.new(Gem.sources.first.uri)
+      else
+        remote = Gem.sources.first.uri
+      end
+      Bundler::Fetcher.new(remote)
+    end
+
+    def get_versions(fetcher, names)
+      # Bundler versions 1.10.0 moves fetchers into separate classes
+      # See https://github.com/bundler/bundler/pull/3518
+      if fetcher.respond_to?(:fetch_dependency_remote_specs, true)
+        versions, _ = fetcher.send(:fetch_dependency_remote_specs, names)
+      else
+        # require 'pry'; binding.pry
+        dependency_fetcher = fetcher.fetchers.find {|f| Bundler::Fetcher::Dependency === f }
+        versions, _ = dependency_fetcher.dependency_specs(names)
+      end
+      versions
+    end
+
   end
 end

data/lib/annotate_gem/version.rb

@@ -1,4 +1,4 @@
 module AnnotateGem
-  VERSION = "0.0.8".freeze
+  VERSION = "0.0.10".freeze
   DESCRIPTION = "Add comments to your Gemfile with each dependency's description.".freeze
 end

data/test/annotate_gem/spec_finder_test.rb

@@ -35,12 +35,10 @@ class AnnotateGem::SpecFinderTest < Minitest::Test
     gem_line_2.stubs(name: "2")
     gem_line_2.expects(:spec=).with(spec_2)
 
-    dependency_fetcher_mock = Bundler::Fetcher::Dependency.new(nil, nil, nil)
-    Bundler::Fetcher.any_instance.expects(:fetchers).returns([dependency_fetcher_mock])
-    dependency_fetcher_mock.expects(:dependency_specs).with(["1", "2"]).returns([[
+    AnnotateGem::SpecFinder.expects(:get_versions).with(instance_of(Bundler::Fetcher), ["1", "2"]).returns([
       ["1", Gem::Version.new("1")],
       ["2", Gem::Version.new("1")],
-    ], "dependencies here"])
+    ])
     AnnotateGem::SpecFinder.expects(:find_latest_version).returns(Gem::Version.new("1")).twice
     Bundler::Fetcher.any_instance.expects(:fetch_spec).with(["1", Gem::Version.new("1")]).returns(spec_1)
     Bundler::Fetcher.any_instance.expects(:fetch_spec).with(["2", Gem::Version.new("1")]).returns(spec_2)
@@ -60,9 +58,7 @@ class AnnotateGem::SpecFinderTest < Minitest::Test
     gem_line_1.stubs(name: "1")
     gem_line_1.expects(:spec=).never
 
-    dependency_fetcher_mock = Bundler::Fetcher::Dependency.new(nil, nil, nil)
-    Bundler::Fetcher.any_instance.expects(:fetchers).returns([dependency_fetcher_mock])
-    dependency_fetcher_mock.expects(:dependency_specs).with(["1"]).returns([[], "dependencies here"])
+    AnnotateGem::SpecFinder.expects(:get_versions).with(instance_of(Bundler::Fetcher), ["1"]).returns([])
     Bundler::Fetcher.any_instance.expects(:fetch_spec).never
     AnnotateGem::SpecFinder.fetch_specs_for([gem_line_1])
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: annotate_gem
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Ivan Tse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-30 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -71,16 +71,19 @@ description: 'Clarify your dependencies by adding a detailed comment to each lin
 email:
 - ivan.tse1@gmail.com
 executables:
+- annotate-gem
 - annotate_gem
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - annotate_gem.gemspec
+- bin/annotate-gem
 - bin/annotate_gem
 - lib/annotate_gem.rb
 - lib/annotate_gem/cli.rb