librarianp 0.6.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 11c125c2dd54a4c4d8e2c201d83e47575f74f28e
-  data.tar.gz: 0702df2d225e4ad32a73a5fd392848bcf2c5847b
+SHA256:
+  metadata.gz: 9c9763e69ec0059b3de54d6be45d61a1c1d8d1da005e7292152c8d87236e6da1
+  data.tar.gz: 8d3ffe4bcccec279c81f3028573aa3b96428c4a98ac09719cf5a5f7317bed661
 SHA512:
-  metadata.gz: 084ff6e04992a0a4e2b27ca80e3b073ebb83024b02ac5adca0448052b2120e3afbf99097be175f8c04210061ef61ed0c60154c8c4aa9f3ec1edf1247d5e18a9f
-  data.tar.gz: 3ee1697ff16421ea291221867e836dc4ac134b0e8e762d3e7a3ad31c4773ad9dca30c12566d50fd282abb7ccb19e5bb77ac7aa7fe63d0c92c17ce89c9fa0566a
+  metadata.gz: d678620dd06362ff48aae226af3ae5cdac3ea2543d111b06c95e972f8d578dc7a100d4efba45eeb23f3f3dd41883979e80c8f33e86e193ed1a111dc3692d3b62
+  data.tar.gz: 20a5aafef57724f5e9a11638cebec6d5e0de4225826ed510e13413521064defa87c39884c4e739d33653f35c5b19158fe87b836438c4fd90f48d725891a94f0d

data/.github/workflows/release.yml

@@ -0,0 +1,32 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'voxpupuli'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Ruby 3.0
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+        env:
+          BUNDLE_WITHOUT: release
+      - name: Build gem
+        run: gem build *.gemspec
+      - name: Publish gem to rubygems.org
+        run: gem push *.gem
+        env:
+          GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_AUTH_TOKEN }}'
+      - name: Setup GitHub packages access
+        run: |
+          mkdir -p ~/.gem
+          echo ":github: Bearer ${{ secrets.GITHUB_TOKEN }}" >> ~/.gem/credentials
+          chmod 0600 ~/.gem/credentials
+      - name: Publish gem to GitHub packages
+        run: gem push --key github --host https://rubygems.pkg.github.com/${{ github.repository_owner }} *.gem

data/.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Test
+
+on:
+  - pull_request
+  - push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "2.4"
+          - "2.5"
+          - "2.6"
+          - "2.7"
+          - "3.0"
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake spec
+      - name: Verify gem builds
+        run: gem build *.gemspec

data/.gitignore

@@ -3,3 +3,4 @@
 pkg/*
 tmp
 vendor
+Gemfile.lock

data/.rspec

@@ -1 +1,2 @@
 --color
+--format documentation

data/CHANGELOG.md

@@ -1,5 +1,44 @@
 # Change Log
 
+## 1.1.1
+
+* Fix one more Ruby 3 compatibility issue
+* Search for the Rakefile relatively to pwd
+
+## 1.1.0
+
+* Support Ruby 3
+
+## 1.0.0
+
+* Require Ruby 2.4+
+* Update dependencies to the latest versions
+* Be specific about exposing git environment variables
+* Allow more spaces in version range
+
+## 0.6.4
+
+* Add support for r10k Puppetfile's opts
+* Fix deprecation warnings
+* Fix compatibility with git 2.14.0
+
+## 0.6.3
+
+* Prevent losing specfile path when metadata doesn't exist
+
+## 0.6.2
+
+* Fix bad variable name
+
+## 0.6.1
+
+* Fix dependencies not being fetched
+
+## 0.6.0
+
+* Merge duplicated dependencies in spec
+* Always fetch the commit SHA from rev-parse
+
 ## 0.5.0
 
 * Allow defining exclusions in spec file

data/Gemfile

@@ -2,7 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in librarian.gemspec
 gemspec
-
-gem "fakefs"
-
-gem "rubysl", :platforms => %w[rbx]

data/README.md

@@ -1,4 +1,4 @@
-Librarian [![Build Status](https://secure.travis-ci.org/carlossg/librarian.png)](http://travis-ci.org/carlossg/librarian) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/carlossg/librarian)
+Librarian [![Build Status](https://secure.travis-ci.org/voxpupuli/librarian.png)](https://travis-ci.org/voxpupuli/librarian)
 =========
 
 This is a forked version published as `librarianp` with improvements in order to support `librarian-puppet`.
@@ -27,7 +27,7 @@ Ensure the gem dependencies are installed:
 Run the tests with the default rake task:
 
     $ [bundle exec] rake
-    
+
 or directly with the rspec command:
 
     $ [bundle exec] rspec spec

data/VERSION

@@ -1 +1 @@
-0.6.3
+1.1.1

data/lib/librarian/cli.rb

@@ -192,7 +192,7 @@ module Librarian
       debug { "Git: #{Source::Git::Repository.bin}" }
       debug { "Git Version: #{Source::Git::Repository.git_version}" }
       debug { "Git Environment Variables:" }
-      git_env = ENV.to_a.select{|(k, v)| k =~ /\AGIT/}.sort_by{|(k, v)| k}
+      git_env = ENV.to_a.select{|(k, v)| k =~ /\AGIT_/}.sort_by{|(k, v)| k}
       if git_env.empty?
         debug { "  (empty)" }
       else

data/lib/librarian/dependency.rb

@@ -125,7 +125,7 @@ module Librarian
 
       # A version range: >=1.0 <2.0
       def range_requirement(arg)
-        arg.match(/(>=? ?\d+(?:\.\d+){0,2}) (<=? ?\d+(?:\.\d+){0,2})/)
+        arg.match(/(>=? ?\d+(?:\.\d+){0,2})\s*(<=? ?\d+(?:\.\d+){0,2})/)
       end
 
       # A string with .x: 1.x, 2.1.x

data/lib/librarian/dsl/receiver.rb

@@ -25,8 +25,8 @@ module Librarian
         end
       end
 
-      def run(specfile = nil)
-        specfile = Proc.new if block_given?
+      def run(specfile = nil, &block)
+        specfile = block if block
 
         case specfile
         when Pathname

data/lib/librarian/dsl.rb

@@ -79,14 +79,14 @@ module Librarian
       Receiver.new(target)
     end
 
-    def run(specfile = nil, sources = [])
+    def run(specfile = nil, sources = [], &block)
       specfile, sources = nil, specfile if specfile.kind_of?(Array) && sources.empty?
 
       Target.new(self).tap do |target|
         target.precache_sources(sources)
         debug_named_source_cache("Pre-Cached Sources", target)
 
-        specfile ||= Proc.new if block_given?
+        specfile ||= block if block_given?
 
         if specfile.kind_of?(Pathname) and !File.exists?(specfile)
           debug { "Specfile #{specfile} not found, using defaults" } unless specfile.nil?

data/lib/librarian/rspec/support/cli_macro.rb

@@ -51,7 +51,7 @@ module Librarian
         def self.included(base)
           base.instance_exec do
             let(:project_path) do
-              project_path = Pathname.new(__FILE__).expand_path
+              project_path = Pathname.pwd.expand_path
               project_path = project_path.dirname until project_path.join("Rakefile").exist?
               project_path
             end

data/lib/librarian/source/git/repository.rb

@@ -21,7 +21,7 @@ module Librarian
           end
 
           def git_version
-            command = %W[#{bin} version --silent]
+            command = %W[#{bin} version]
             Posix.run!(command).strip =~ /\Agit version (\d+(\.\d+)*)/ && $1
           end
         end

data/lib/librarian/source/git.rb

@@ -14,7 +14,7 @@ module Librarian
       include Local
 
       lock_name 'GIT'
-      spec_options [:ref, :path]
+      spec_options [:ref, :branch, :tag, :commit, :path]
 
       DEFAULTS = {
         :ref => 'master'
@@ -23,13 +23,17 @@ module Librarian
       attr_accessor :environment
       private :environment=
 
-      attr_accessor :uri, :ref, :sha, :path
-      private :uri=, :ref=, :sha=, :path=
+      attr_accessor :uri, :ref, :branch, :tag, :commit, :sha, :path
+      private :uri=, :ref=, :branch=, :tag=, :commit=, :sha=, :path=
 
       def initialize(environment, uri, options)
+        validate_options(uri, options)
+
         self.environment = environment
         self.uri = uri
-        self.ref = options[:ref] || DEFAULTS[:ref]
+        self.ref = options[:ref] || options[:branch] ||
+                   options[:tag] || options[:commit] ||
+                   DEFAULTS[:ref]
         self.sha = options[:sha]
         self.path = options[:path]
 
@@ -173,6 +177,13 @@ module Librarian
         @runtime_cache ||= environment.runtime_cache.keyspace(self.class.name)
       end
 
+      def validate_options(uri, options)
+        found = 0; [:ref, :branch, :tag, :commit].each do |opt|
+          found += 1 if options.has_key?(opt)
+          found > 1 and raise Error,
+            "at #{uri}, use only one of ref, branch, tag, or commit"
+        end
+      end
     end
   end
 end

data/librarianp.gemspec

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |gem|
+  gem.name          = "librarianp"
+  gem.version       = File.read(File.expand_path('VERSION', __dir__)).strip
+  gem.authors       = ["Jay Feldblum", "Carlos Sanchez"]
+  gem.email         = ["y_feldblum@yahoo.com", "carlos@apache.org"]
+  gem.summary       = %q{A Framework for Bundlers.}
+  gem.description   = %q{A Framework for Bundlers, used by librarian-puppet.}
+  gem.homepage      = "https://github.com/voxpupuli/librarian"
+  gem.license       = "MIT"
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+
+  gem.required_ruby_version = '>= 2.4', '< 4'
+
+  gem.add_dependency "thor", "~> 1.0"
+
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec", "~> 3.0"
+  gem.add_development_dependency "json"
+  gem.add_development_dependency "fakefs", "~> 1.0"
+end

data/spec/functional/source/git/repository_spec.rb

@@ -40,20 +40,20 @@ describe Librarian::Source::Git::Repository do
       # master
       FileUtils.touch "butter.txt"
       git! %W[add butter.txt]
-      git! %W[commit -m #{"Initial Commit"}]
+      git! %W[commit -m #{"Initial Commit"} --no-gpg-sign]
 
       # branch
       git! %W[checkout -b #{branch} --quiet]
       FileUtils.touch "jam.txt"
       git! %W[add jam.txt]
-      git! %W[commit -m #{"Branch Commit"}]
+      git! %W[commit -m #{"Branch Commit"} --no-gpg-sign]
       git! %W[checkout master --quiet]
 
       # tag/atag
       git! %W[checkout -b deletable --quiet]
       FileUtils.touch "jelly.txt"
       git! %W[add jelly.txt]
-      git! %W[commit -m #{"Tag Commit"}]
+      git! %W[commit -m #{"Tag Commit"} --no-gpg-sign]
       git! %W[tag #{tag}]
       git! %W[tag -am #{"Annotated Tag Commit"} #{atag}]
       git! %W[checkout master --quiet]
@@ -108,7 +108,7 @@ describe Librarian::Source::Git::Repository do
     end
 
     it "should have a single remote for it" do
-      expect(subject).to have(1).remote_names
+      expect(subject.remote_names.size).to eq 1
     end
 
     it "should have a remote with the expected name" do

data/spec/functional/source/git_spec.rb

@@ -54,7 +54,7 @@ describe Librarian::Source::Git do
         git! %W[config user.email simba@savannah-pride.gov]
         FileUtils.touch "butter.txt"
         git! %W[add butter.txt]
-        git! %W[commit -m #{"Initial Commit"}]
+        git! %W[commit -m #{"Initial Commit"} --no-gpg-sign]
       end
     end
 
@@ -150,7 +150,7 @@ describe Librarian::Source::Git do
         Dir.chdir(git_source_path) do
           FileUtils.touch "jam.txt"
           git! %w[add jam.txt]
-          git! %W[commit -m #{"Some Jam"}]
+          git! %W[commit -m #{"Some Jam"} --no-gpg-sign]
         end
       end
 

data/spec/unit/action/clean_spec.rb

@@ -7,7 +7,7 @@ module Librarian
     let(:action) { described_class.new(env) }
 
     before do
-      action.stub(:debug)
+      allow(action).to receive(:debug)
     end
 
     describe "#run" do
@@ -21,12 +21,12 @@ module Librarian
         describe "clearing the cache path" do
 
           before do
-            action.stub(:clean_install_path)
+            allow(action).to receive(:clean_install_path)
           end
 
           context "when the cache path is missing" do
             before do
-              env.stub_chain(:cache_path, :exist?) { false }
+              allow(env).to receive_message_chain(:cache_path, :exist?).and_return(false)
             end
 
             it "should not try to clear the cache path" do
@@ -36,7 +36,7 @@ module Librarian
 
           context "when the cache path is present" do
             before do
-              env.stub_chain(:cache_path, :exist?) { true }
+              allow(env).to receive_message_chain(:cache_path, :exist?).and_return(true)
             end
 
             it "should try to clear the cache path" do
@@ -49,12 +49,12 @@ module Librarian
         describe "clearing the install path" do
 
           before do
-            action.stub(:clean_cache_path)
+            allow(action).to receive(:clean_cache_path)
           end
 
           context "when the install path is missing" do
             before do
-              env.stub_chain(:install_path, :exist?) { false }
+              allow(env).to receive_message_chain(:install_path, :exist?).and_return(false)
             end
 
             it "should not try to clear the install path" do
@@ -64,15 +64,15 @@ module Librarian
 
           context "when the install path is present" do
             before do
-              env.stub_chain(:install_path, :exist?) { true }
+              allow(env).to receive_message_chain(:install_path, :exist?).and_return(true)
             end
 
             it "should try to clear the install path" do
               children = [double, double, double]
               children.each do |child|
-                child.stub(:file?) { false }
+                allow(child).to receive(:file?).and_return(false)
               end
-              env.stub_chain(:install_path, :children) { children }
+              allow(env).to receive_message_chain(:install_path, :children).and_return(children)
 
               children.each do |child|
                 expect(child).to receive(:rmtree).exactly(:once)
@@ -81,7 +81,7 @@ module Librarian
 
             it "should only try to clear out directories from the install path, not files" do
               children = [double(:file? => false), double(:file? => true), double(:file? => true)]
-              env.stub_chain(:install_path, :children) { children }
+              allow(env).to receive_message_chain(:install_path, :children).and_return(children)
 
               children.select(&:file?).each do |child|
                 expect(child).to receive(:rmtree).never

data/spec/unit/action/ensure_spec.rb

@@ -10,13 +10,13 @@ module Librarian
     let(:action) { described_class.new(env) }
 
     before do
-      env.stub(:specfile_name) { "Specfile" }
+      allow(env).to receive(:specfile_name).and_return("Specfile")
     end
 
     describe "#run" do
 
       context "when the environment does not know its project path" do
-        before { env.stub(:project_path) { nil } }
+        before { allow(env).to receive(:project_path).and_return(nil) }
 
         it "should raise an error describing that the specfile is mising" do
           expect { action.run }.to raise_error(Error, "Cannot find Specfile!")
@@ -24,7 +24,7 @@ module Librarian
       end
 
       context "when the environment knows its project path" do
-        before { env.stub(:project_path) { Dir.tmpdir } }
+        before { allow(env).to receive(:project_path) { Dir.tmpdir } }
 
         it "should not raise an error" do
           expect { action.run }.to_not raise_error

data/spec/unit/action/install_spec.rb

@@ -15,7 +15,7 @@ module Librarian
 
           context "when the specfile is missing" do
             before do
-              env.stub_chain(:specfile_path, :exist?) { false }
+              allow(env).to receive_message_chain(:specfile_path, :exist?) { false }
             end
 
             it "should raise an error explaining that the specfile is missing" do
@@ -25,8 +25,8 @@ module Librarian
 
           context "when the specfile is present but the lockfile is missing" do
             before do
-              env.stub_chain(:specfile_path, :exist?) { true }
-              env.stub_chain(:lockfile_path, :exist?) { false }
+              allow(env).to receive_message_chain(:specfile_path, :exist?) { true }
+              allow(env).to receive_message_chain(:lockfile_path, :exist?) { false }
             end
 
             it "should raise an error explaining that the lockfile is missing" do
@@ -36,9 +36,9 @@ module Librarian
 
           context "when the specfile and lockfile are present but inconsistent" do
             before do
-              env.stub_chain(:specfile_path, :exist?) { true }
-              env.stub_chain(:lockfile_path, :exist?) { true }
-              action.stub(:spec_consistent_with_lock?) { false }
+              allow(env).to receive_message_chain(:specfile_path, :exist?) { true }
+              allow(env).to receive_message_chain(:lockfile_path, :exist?) { true }
+              allow(action).to receive(:spec_consistent_with_lock?) { false }
             end
 
             it "should raise an error explaining the inconsistenty" do
@@ -48,10 +48,10 @@ module Librarian
 
           context "when the specfile and lockfile are present and consistent" do
             before do
-              env.stub_chain(:specfile_path, :exist?) { true }
-              env.stub_chain(:lockfile_path, :exist?) { true }
-              action.stub(:spec_consistent_with_lock?) { true }
-              action.stub(:perform_installation)
+              allow(env).to receive_message_chain(:specfile_path, :exist?) { true }
+              allow(env).to receive_message_chain(:lockfile_path, :exist?) { true }
+              allow(action).to receive(:spec_consistent_with_lock?) { true }
+              allow(action).to receive(:perform_installation)
             end
 
             it "should not raise an error" do
@@ -72,10 +72,10 @@ module Librarian
           let(:install_path) { double }
 
           before do
-            env.stub(:install_path) { install_path }
-            action.stub(:check_preconditions)
-            action.stub(:destructive?) { true }
-            action.stub_chain(:lock, :manifests) { manifests }
+            allow(env).to receive(:install_path) { install_path }
+            allow(action).to receive(:check_preconditions)
+            allow(action).to receive(:destructive?) { true }
+            allow(action).to receive_message_chain(:lock, :manifests) { manifests }
           end
 
           after do
@@ -85,7 +85,7 @@ module Librarian
           it "should sort and install the manifests" do
             expect(ManifestSet).to receive(:sort).with(manifests).exactly(:once).ordered { sorted_manifests }
 
-            install_path.stub(:exist?) { false }
+            allow(install_path).to receive(:exist?) { false }
             expect(install_path).to receive(:mkpath).exactly(:once).ordered
 
             sorted_manifests.each do |manifest|
@@ -94,10 +94,10 @@ module Librarian
           end
 
           it "should recreate the install path if it already exists" do
-            action.stub(:sorted_manifests) { sorted_manifests }
-            action.stub(:install_manifests)
+            allow(action).to receive(:sorted_manifests) { sorted_manifests }
+            allow(action).to receive(:install_manifests)
 
-            install_path.stub(:exist?) { true }
+            allow(install_path).to receive(:exist?) { true }
             expect(install_path).to receive(:rmtree)
             expect(install_path).to receive(:mkpath)
           end

data/spec/unit/action/resolve_spec.rb

@@ -15,7 +15,7 @@ module Librarian
     let(:source2) { Librarian::Mock::Source::Mock.new(env, "source2", {}) }
 
     before do
-      env.stub(:specfile => double(:read => spec))
+      allow(env).to receive_messages(:specfile => double(:read => spec))
     end
 
     describe "#run" do
@@ -35,8 +35,9 @@ module Librarian
           end
 
           it "should merge duplicated dependencies" do
-            Dependency.any_instance.stub(:manifests => [manifest])
-            action.stub(:persist_resolution)
+            allow_any_instance_of(Dependency).to receive_messages(:manifests => [manifest])
+            allow_any_instance_of(Librarian::Logger).to receive(:info)
+            allow(action).to receive(:persist_resolution)
             resolution = action.run
             expect(resolution.dependencies).to eq([dependency2])
           end

data/spec/unit/algorithms_spec.rb

@@ -5,7 +5,7 @@ module Librarian
 
     describe AdjacencyListDirectedGraph do
 
-      describe :cyclic? do
+      describe 'cyclic?' do
         subject(:result) { described_class.cyclic?(graph) }
 
         context "with an empty graph" do
@@ -45,7 +45,7 @@ module Librarian
 
       end
 
-      describe :feedback_arc_set do
+      describe 'feedback_arc_set' do
         subject(:result) { described_class.feedback_arc_set(graph) }
 
         context "with an empty graph" do
@@ -85,7 +85,7 @@ module Librarian
 
       end
 
-      describe :tsort_cyclic do
+      describe 'tsort_cyclic' do
         subject(:result) { described_class.tsort_cyclic(graph) }
 
         context "with an empty graph" do

data/spec/unit/dependency/requirement_spec.rb

@@ -10,27 +10,28 @@ describe Librarian::Dependency::Requirement do
   end
 
   it 'should handle nil versions' do
-    described_class.new(nil).to_gem_requirement.should eq(Gem::Requirement.new)
+    expect(described_class.new(nil).to_gem_requirement).to eq(Gem::Requirement.new)
   end
 
   it 'should handle nil versions in arrays' do
-    described_class.new([nil]).to_gem_requirement.should eq(Gem::Requirement.new)
+    expect(described_class.new([nil]).to_gem_requirement).to eq(Gem::Requirement.new)
   end
 
   it 'should handle .x versions' do
-    described_class.new('1.x').to_gem_requirement.should eq(Gem::Requirement.new('~> 1.0'))
-    described_class.new('1.0.x').to_gem_requirement.should eq(Gem::Requirement.new('~> 1.0.0'))
+    expect(described_class.new('1.x').to_gem_requirement).to eq(Gem::Requirement.new('~> 1.0'))
+    expect(described_class.new('1.0.x').to_gem_requirement).to eq(Gem::Requirement.new('~> 1.0.0'))
   end
 
   it 'should handle version ranges' do
-    described_class.new('>=1.1.0 <2.0.0').to_gem_requirement.should eq(Gem::Requirement.new(['>=1.1.0', '<2.0.0']))
+    expect(described_class.new('>=1.1.0 <2.0.0').to_gem_requirement).to eq(Gem::Requirement.new(['>=1.1.0', '<2.0.0']))
+    expect(described_class.new('>=1.1.0  <2.0.0').to_gem_requirement).to eq(Gem::Requirement.new(['>=1.1.0', '<2.0.0']))
   end
 
   it 'should print to_s' do
-    described_class.new('1.x').to_s.should eq('~> 1.0')
+    expect(described_class.new('1.x').to_s).to eq('~> 1.0')
     s = described_class.new('>=1.1.0 <2.0.0').to_s
-    s.should include(">= 1.1.0")
-    s.should include("< 2.0.0")
+    expect(s).to include(">= 1.1.0")
+    expect(s).to include("< 2.0.0")
   end
 
 end

data/spec/unit/environment_spec.rb

@@ -26,7 +26,7 @@ module Librarian
         with_env "HOME" => "/path/to/home"
 
         it "finds the home" do
-          env.stub(:adapter_name).and_return("cat")
+          allow(env).to receive(:adapter_name).and_return("cat")
           expect(env.config_db.underlying_home.to_s).to eq "/path/to/home"
         end
       end
@@ -36,7 +36,7 @@ module Librarian
         with_env "HOME" => nil
 
         it "finds the home" do
-          env.stub(:adapter_name).and_return("cat")
+          allow(env).to receive(:adapter_name).and_return("cat")
           expect(env.config_db.underlying_home.to_s).to eq real_home
         end
       end

data/spec/unit/lockfile/parser_spec.rb

@@ -45,7 +45,7 @@ module Librarian
       end
 
       it "should give a list of one dependency" do
-        expect(resolution).to have(1).dependencies
+        expect(resolution.dependencies.size).to eq 1
       end
 
       it "should give a dependency with the expected name" do
@@ -57,8 +57,7 @@ module Librarian
       it "should give a dependency with the expected requirement" do
         dependency = resolution.dependencies.first
 
-        # Note: it must be this order because this order is lexicographically sorted.
-        expect(dependency.requirement.to_s).to eq "!= 1.2.6, ~> 1.1"
+        expect(dependency.requirement).to eq Librarian::Dependency::Requirement.new(["~> 1.1", "!= 1.2.6"])
       end
 
       it "should give a dependency wth the expected source" do
@@ -69,7 +68,7 @@ module Librarian
       end
 
       it "should give a list of one manifest" do
-        expect(resolution).to have(1).manifests
+        expect(resolution.manifests.size).to eq 1
       end
 
       it "should give a manifest with the expected name" do
@@ -125,7 +124,7 @@ module Librarian
       end
 
       it "should give a list of one dependency" do
-        expect(resolution).to have(1).dependencies
+        expect(resolution.dependencies.size).to eq 1
       end
 
       it "should have the expected dependency" do
@@ -135,7 +134,7 @@ module Librarian
       end
 
       it "should give a list of all the manifests" do
-        expect(resolution).to have(2).manifests
+        expect(resolution.manifests.size).to eq 2
       end
 
       it "should include all the expected manifests" do

data/spec/unit/lockfile_spec.rb

@@ -29,7 +29,7 @@ module Librarian
         subject { resolution }
 
         it { should be_correct }
-        it { should have(1).manifests }
+        it { expect(subject.manifests.size).to eq 1 }
       end
     end
 

data/spec/unit/mock/source/mock_spec.rb

@@ -12,7 +12,7 @@ module Librarian
           let(:source) { described_class.new(env, "source-a", {}) }
           subject { source }
 
-          its(:environment) { should_not be_nil }
+          it { expect(subject.environment).to_not be_nil }
 
         end
 

data/spec/unit/resolver_spec.rb

@@ -94,7 +94,7 @@ module Librarian
       end
 
       it "should have the expected number of sources" do
-        expect(spec).to have(2).sources
+        expect(spec.sources.size).to eq 2
       end
 
       let(:resolution) { resolver.resolve(spec) }
@@ -288,7 +288,7 @@ module Librarian
       it "loads the specfile with the __FILE__" do
         write! specfile_path, "src __FILE__"
         spec = env.dsl(specfile_path)
-        expect(spec.sources).to have(1).item
+        expect(spec.sources.size).to eq 1
         source = spec.sources.first
         expect(source.name).to eq specfile_path.to_s
       end

data/spec/unit/source/git_spec.rb

@@ -17,11 +17,17 @@ module Librarian
 
         context "with an unknown option" do
           it "should raise" do
-            expect { described_class.from_spec_args(env, "some://git/repo.git", :branch => "megapatches") }.
-              to raise_error Error, "unrecognized options: branch"
+            expect { described_class.from_spec_args(env, "some://git/repo.git", :I_am_unknown => "megapatches") }.
+              to raise_error Error, "unrecognized options: I_am_unknown"
           end
         end
 
+        context "with invalid options" do
+          it "should raise" do
+            expect { described_class.from_spec_args(env, "some://git/repo.git", {:ref => "megapatches", :branch => "megapatches"}) }.
+              to raise_error Error, "at some://git/repo.git, use only one of ref, branch, tag, or commit"
+          end
+        end
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarianp
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 1.1.1
 platform: ruby
 authors:
 - Jay Feldblum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '1.0'
 description: A Framework for Bundlers, used by librarian-puppet.
 email:
 - y_feldblum@yahoo.com
@@ -89,12 +89,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -159,7 +159,7 @@ files:
 - lib/librarian/support/abstract_method.rb
 - lib/librarian/ui.rb
 - lib/librarian/version.rb
-- librarian.gemspec
+- librarianp.gemspec
 - spec/functional/cli_spec.rb
 - spec/functional/posix_spec.rb
 - spec/functional/source/git/repository_spec.rb
@@ -190,7 +190,7 @@ files:
 - spec/unit/resolver_spec.rb
 - spec/unit/source/git_spec.rb
 - spec/unit/spec_change_set_spec.rb
-homepage: https://github.com/carlossg/librarian
+homepage: https://github.com/voxpupuli/librarian
 licenses:
 - MIT
 metadata: {}
@@ -202,15 +202,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A Framework for Bundlers.

data/.travis.yml

@@ -1,11 +0,0 @@
-sudo: false
-language: ruby
-script: bundle exec rake
-rvm:
-  - '2.2'
-  - '2.1'
-  - '2.0'
-  - '1.9'
-  - '1.8'
-  - jruby-19mode
-  - jruby-18mode

data/Gemfile.lock

@@ -1,233 +0,0 @@
-PATH
-  remote: .
-  specs:
-    librarianp (0.6.3)
-      thor (~> 0.15)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    fakefs (0.4.2)
-    ffi2-generators (0.1.1)
-    json (1.8.2)
-    rake (10.4.2)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.3)
-    rubysl (2.1.0)
-      rubysl-abbrev (~> 2.0)
-      rubysl-base64 (~> 2.0)
-      rubysl-benchmark (~> 2.0)
-      rubysl-bigdecimal (~> 2.0)
-      rubysl-cgi (~> 2.0)
-      rubysl-cgi-session (~> 2.0)
-      rubysl-cmath (~> 2.0)
-      rubysl-complex (~> 2.0)
-      rubysl-continuation (~> 2.0)
-      rubysl-coverage (~> 2.0)
-      rubysl-csv (~> 2.0)
-      rubysl-curses (~> 2.0)
-      rubysl-date (~> 2.0)
-      rubysl-delegate (~> 2.0)
-      rubysl-digest (~> 2.0)
-      rubysl-drb (~> 2.0)
-      rubysl-e2mmap (~> 2.0)
-      rubysl-english (~> 2.0)
-      rubysl-enumerator (~> 2.0)
-      rubysl-erb (~> 2.0)
-      rubysl-etc (~> 2.0)
-      rubysl-expect (~> 2.0)
-      rubysl-fcntl (~> 2.0)
-      rubysl-fiber (~> 2.0)
-      rubysl-fileutils (~> 2.0)
-      rubysl-find (~> 2.0)
-      rubysl-forwardable (~> 2.0)
-      rubysl-getoptlong (~> 2.0)
-      rubysl-gserver (~> 2.0)
-      rubysl-io-console (~> 2.0)
-      rubysl-io-nonblock (~> 2.0)
-      rubysl-io-wait (~> 2.0)
-      rubysl-ipaddr (~> 2.0)
-      rubysl-irb (~> 2.1)
-      rubysl-logger (~> 2.0)
-      rubysl-mathn (~> 2.0)
-      rubysl-matrix (~> 2.0)
-      rubysl-mkmf (~> 2.0)
-      rubysl-monitor (~> 2.0)
-      rubysl-mutex_m (~> 2.0)
-      rubysl-net-ftp (~> 2.0)
-      rubysl-net-http (~> 2.0)
-      rubysl-net-imap (~> 2.0)
-      rubysl-net-pop (~> 2.0)
-      rubysl-net-protocol (~> 2.0)
-      rubysl-net-smtp (~> 2.0)
-      rubysl-net-telnet (~> 2.0)
-      rubysl-nkf (~> 2.0)
-      rubysl-observer (~> 2.0)
-      rubysl-open-uri (~> 2.0)
-      rubysl-open3 (~> 2.0)
-      rubysl-openssl (~> 2.0)
-      rubysl-optparse (~> 2.0)
-      rubysl-ostruct (~> 2.0)
-      rubysl-pathname (~> 2.0)
-      rubysl-prettyprint (~> 2.0)
-      rubysl-prime (~> 2.0)
-      rubysl-profile (~> 2.0)
-      rubysl-profiler (~> 2.0)
-      rubysl-pstore (~> 2.0)
-      rubysl-pty (~> 2.0)
-      rubysl-rational (~> 2.0)
-      rubysl-resolv (~> 2.0)
-      rubysl-rexml (~> 2.0)
-      rubysl-rinda (~> 2.0)
-      rubysl-rss (~> 2.0)
-      rubysl-scanf (~> 2.0)
-      rubysl-securerandom (~> 2.0)
-      rubysl-set (~> 2.0)
-      rubysl-shellwords (~> 2.0)
-      rubysl-singleton (~> 2.0)
-      rubysl-socket (~> 2.0)
-      rubysl-stringio (~> 2.0)
-      rubysl-strscan (~> 2.0)
-      rubysl-sync (~> 2.0)
-      rubysl-syslog (~> 2.0)
-      rubysl-tempfile (~> 2.0)
-      rubysl-thread (~> 2.0)
-      rubysl-thwait (~> 2.0)
-      rubysl-time (~> 2.0)
-      rubysl-timeout (~> 2.0)
-      rubysl-tmpdir (~> 2.0)
-      rubysl-tsort (~> 2.0)
-      rubysl-un (~> 2.0)
-      rubysl-uri (~> 2.0)
-      rubysl-weakref (~> 2.0)
-      rubysl-webrick (~> 2.0)
-      rubysl-xmlrpc (~> 2.0)
-      rubysl-yaml (~> 2.0)
-      rubysl-zlib (~> 2.0)
-    rubysl-abbrev (2.0.4)
-    rubysl-base64 (2.0.0)
-    rubysl-benchmark (2.0.1)
-    rubysl-bigdecimal (2.0.2)
-    rubysl-cgi (2.0.1)
-    rubysl-cgi-session (2.0.1)
-    rubysl-cmath (2.0.0)
-    rubysl-complex (2.0.0)
-    rubysl-continuation (2.0.0)
-    rubysl-coverage (2.0.3)
-    rubysl-csv (2.0.2)
-      rubysl-english (~> 2.0)
-    rubysl-curses (2.0.1)
-    rubysl-date (2.0.9)
-    rubysl-delegate (2.0.1)
-    rubysl-digest (2.0.3)
-    rubysl-drb (2.0.1)
-    rubysl-e2mmap (2.0.0)
-    rubysl-english (2.0.0)
-    rubysl-enumerator (2.0.0)
-    rubysl-erb (2.0.2)
-    rubysl-etc (2.0.3)
-      ffi2-generators (~> 0.1)
-    rubysl-expect (2.0.0)
-    rubysl-fcntl (2.0.4)
-      ffi2-generators (~> 0.1)
-    rubysl-fiber (2.0.0)
-    rubysl-fileutils (2.0.3)
-    rubysl-find (2.0.1)
-    rubysl-forwardable (2.0.1)
-    rubysl-getoptlong (2.0.0)
-    rubysl-gserver (2.0.0)
-      rubysl-socket (~> 2.0)
-      rubysl-thread (~> 2.0)
-    rubysl-io-console (2.0.0)
-    rubysl-io-nonblock (2.0.0)
-    rubysl-io-wait (2.0.0)
-    rubysl-ipaddr (2.0.0)
-    rubysl-irb (2.1.1)
-      rubysl-e2mmap (~> 2.0)
-      rubysl-mathn (~> 2.0)
-      rubysl-thread (~> 2.0)
-    rubysl-logger (2.1.0)
-    rubysl-mathn (2.0.0)
-    rubysl-matrix (2.1.0)
-      rubysl-e2mmap (~> 2.0)
-    rubysl-mkmf (2.0.1)
-      rubysl-fileutils (~> 2.0)
-      rubysl-shellwords (~> 2.0)
-    rubysl-monitor (2.0.0)
-    rubysl-mutex_m (2.0.0)
-    rubysl-net-ftp (2.0.1)
-    rubysl-net-http (2.0.4)
-      rubysl-cgi (~> 2.0)
-      rubysl-erb (~> 2.0)
-      rubysl-singleton (~> 2.0)
-    rubysl-net-imap (2.0.1)
-    rubysl-net-pop (2.0.1)
-    rubysl-net-protocol (2.0.1)
-    rubysl-net-smtp (2.0.1)
-    rubysl-net-telnet (2.0.0)
-    rubysl-nkf (2.0.1)
-    rubysl-observer (2.0.0)
-    rubysl-open-uri (2.0.0)
-    rubysl-open3 (2.0.0)
-    rubysl-openssl (2.2.1)
-    rubysl-optparse (2.0.1)
-      rubysl-shellwords (~> 2.0)
-    rubysl-ostruct (2.0.4)
-    rubysl-pathname (2.1.0)
-    rubysl-prettyprint (2.0.3)
-    rubysl-prime (2.0.1)
-    rubysl-profile (2.0.0)
-    rubysl-profiler (2.0.1)
-    rubysl-pstore (2.0.0)
-    rubysl-pty (2.0.3)
-    rubysl-rational (2.0.1)
-    rubysl-resolv (2.1.2)
-    rubysl-rexml (2.0.4)
-    rubysl-rinda (2.0.1)
-    rubysl-rss (2.0.0)
-    rubysl-scanf (2.0.0)
-    rubysl-securerandom (2.0.0)
-    rubysl-set (2.0.1)
-    rubysl-shellwords (2.0.0)
-    rubysl-singleton (2.0.0)
-    rubysl-socket (2.0.1)
-    rubysl-stringio (2.0.0)
-    rubysl-strscan (2.0.0)
-    rubysl-sync (2.0.0)
-    rubysl-syslog (2.1.0)
-      ffi2-generators (~> 0.1)
-    rubysl-tempfile (2.0.1)
-    rubysl-thread (2.0.3)
-    rubysl-thwait (2.0.0)
-    rubysl-time (2.0.3)
-    rubysl-timeout (2.0.0)
-    rubysl-tmpdir (2.0.1)
-    rubysl-tsort (2.0.1)
-    rubysl-un (2.0.0)
-      rubysl-fileutils (~> 2.0)
-      rubysl-optparse (~> 2.0)
-    rubysl-uri (2.0.0)
-    rubysl-weakref (2.0.0)
-    rubysl-webrick (2.0.0)
-    rubysl-xmlrpc (2.0.0)
-    rubysl-yaml (2.1.0)
-    rubysl-zlib (2.0.1)
-    thor (0.19.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fakefs
-  json
-  librarianp!
-  rake
-  rspec (~> 2.14)
-  rubysl

data/librarian.gemspec

@@ -1,44 +0,0 @@
-# -*- encoding: utf-8 -*-
-# stub: librarianp 0.6.3 ruby lib
-
-Gem::Specification.new do |s|
-  s.name = "librarianp"
-  s.version = "0.6.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Jay Feldblum", "Carlos Sanchez"]
-  s.date = "2015-05-20"
-  s.description = "A Framework for Bundlers, used by librarian-puppet."
-  s.email = ["y_feldblum@yahoo.com", "carlos@apache.org"]
-  s.files = [".gitignore", ".rspec", ".travis.yml", "CHANGELOG.md", "Gemfile", "Gemfile.lock", "LICENSE.txt", "README.md", "Rakefile", "VERSION", "lib/librarian.rb", "lib/librarian/action.rb", "lib/librarian/action/base.rb", "lib/librarian/action/clean.rb", "lib/librarian/action/ensure.rb", "lib/librarian/action/install.rb", "lib/librarian/action/persist_resolution_mixin.rb", "lib/librarian/action/resolve.rb", "lib/librarian/action/update.rb", "lib/librarian/algorithms.rb", "lib/librarian/cli.rb", "lib/librarian/cli/manifest_presenter.rb", "lib/librarian/config.rb", "lib/librarian/config/database.rb", "lib/librarian/config/file_source.rb", "lib/librarian/config/hash_source.rb", "lib/librarian/config/source.rb", "lib/librarian/dependency.rb", "lib/librarian/dsl.rb", "lib/librarian/dsl/receiver.rb", "lib/librarian/dsl/target.rb", "lib/librarian/environment.rb", "lib/librarian/environment/runtime_cache.rb", "lib/librarian/error.rb", "lib/librarian/helpers.rb", "lib/librarian/linter/source_linter.rb", "lib/librarian/lockfile.rb", "lib/librarian/lockfile/compiler.rb", "lib/librarian/lockfile/parser.rb", "lib/librarian/logger.rb", "lib/librarian/manifest.rb", "lib/librarian/manifest/pre_release_version.rb", "lib/librarian/manifest/version.rb", "lib/librarian/manifest_set.rb", "lib/librarian/mock.rb", "lib/librarian/mock/cli.rb", "lib/librarian/mock/dsl.rb", "lib/librarian/mock/environment.rb", "lib/librarian/mock/extension.rb", "lib/librarian/mock/source.rb", "lib/librarian/mock/source/mock.rb", "lib/librarian/mock/source/mock/registry.rb", "lib/librarian/mock/version.rb", "lib/librarian/posix.rb", "lib/librarian/resolution.rb", "lib/librarian/resolver.rb", "lib/librarian/resolver/implementation.rb", "lib/librarian/rspec/support/cli_macro.rb", "lib/librarian/source.rb", "lib/librarian/source/basic_api.rb", "lib/librarian/source/git.rb", "lib/librarian/source/git/repository.rb", "lib/librarian/source/local.rb", "lib/librarian/source/path.rb", "lib/librarian/spec.rb", "lib/librarian/spec_change_set.rb", "lib/librarian/specfile.rb", "lib/librarian/support/abstract_method.rb", "lib/librarian/ui.rb", "lib/librarian/version.rb", "librarian.gemspec", "spec/functional/cli_spec.rb", "spec/functional/posix_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/functional/source/git_spec.rb", "spec/support/fakefs.rb", "spec/support/method_patch_macro.rb", "spec/support/project_path_macro.rb", "spec/support/with_env_macro.rb", "spec/unit/action/base_spec.rb", "spec/unit/action/clean_spec.rb", "spec/unit/action/ensure_spec.rb", "spec/unit/action/install_spec.rb", "spec/unit/action/resolve_spec.rb", "spec/unit/algorithms_spec.rb", "spec/unit/config/database_spec.rb", "spec/unit/dependency/requirement_spec.rb", "spec/unit/dependency_spec.rb", "spec/unit/dsl_spec.rb", "spec/unit/environment/runtime_cache_spec.rb", "spec/unit/environment_spec.rb", "spec/unit/lockfile/parser_spec.rb", "spec/unit/lockfile_spec.rb", "spec/unit/manifest/version_spec.rb", "spec/unit/manifest_set_spec.rb", "spec/unit/manifest_spec.rb", "spec/unit/mock/environment_spec.rb", "spec/unit/mock/source/mock_spec.rb", "spec/unit/resolver_spec.rb", "spec/unit/source/git_spec.rb", "spec/unit/spec_change_set_spec.rb"]
-  s.homepage = "https://github.com/carlossg/librarian"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.6"
-  s.summary = "A Framework for Bundlers."
-  s.test_files = ["spec/functional/cli_spec.rb", "spec/functional/posix_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/functional/source/git_spec.rb", "spec/support/fakefs.rb", "spec/support/method_patch_macro.rb", "spec/support/project_path_macro.rb", "spec/support/with_env_macro.rb", "spec/unit/action/base_spec.rb", "spec/unit/action/clean_spec.rb", "spec/unit/action/ensure_spec.rb", "spec/unit/action/install_spec.rb", "spec/unit/action/resolve_spec.rb", "spec/unit/algorithms_spec.rb", "spec/unit/config/database_spec.rb", "spec/unit/dependency/requirement_spec.rb", "spec/unit/dependency_spec.rb", "spec/unit/dsl_spec.rb", "spec/unit/environment/runtime_cache_spec.rb", "spec/unit/environment_spec.rb", "spec/unit/lockfile/parser_spec.rb", "spec/unit/lockfile_spec.rb", "spec/unit/manifest/version_spec.rb", "spec/unit/manifest_set_spec.rb", "spec/unit/manifest_spec.rb", "spec/unit/mock/environment_spec.rb", "spec/unit/mock/source/mock_spec.rb", "spec/unit/resolver_spec.rb", "spec/unit/source/git_spec.rb", "spec/unit/spec_change_set_spec.rb"]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, ["~> 0.15"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.14"])
-      s.add_development_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<fakefs>, ["~> 0.4.2"])
-    else
-      s.add_dependency(%q<thor>, ["~> 0.15"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.14"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<fakefs>, ["~> 0.4.2"])
-    end
-  else
-    s.add_dependency(%q<thor>, ["~> 0.15"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.14"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<fakefs>, ["~> 0.4.2"])
-  end
-end