librarianp 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11c125c2dd54a4c4d8e2c201d83e47575f74f28e
-  data.tar.gz: 0702df2d225e4ad32a73a5fd392848bcf2c5847b
+  metadata.gz: 84c696d0444d434da7b13dd4b358eb4aa1c33f96
+  data.tar.gz: 3222e657cf5e567d49fdcd3b7d99ef1f921edb6c
 SHA512:
-  metadata.gz: 084ff6e04992a0a4e2b27ca80e3b073ebb83024b02ac5adca0448052b2120e3afbf99097be175f8c04210061ef61ed0c60154c8c4aa9f3ec1edf1247d5e18a9f
-  data.tar.gz: 3ee1697ff16421ea291221867e836dc4ac134b0e8e762d3e7a3ad31c4773ad9dca30c12566d50fd282abb7ccb19e5bb77ac7aa7fe63d0c92c17ce89c9fa0566a
+  metadata.gz: ebd2cbd00d9d86a3e6620ff0e4ca2f2e952e5a80a22854be6e18ed24bec09a45b837b42540a21dec6b3066113cc9af85ff1c22fe694e277e98328b7d0025d099
+  data.tar.gz: 7c5a7ca4d12c20780e4dc6c9955cb8c59e3625735265c687191fd80413088e9a05b4d1c0a51a7a7f8eb081b95707196cb8587e9dd67da0a3d1c0c9e460ecb37a

data/.rspec

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

data/.travis.yml

@@ -2,10 +2,14 @@ sudo: false
 language: ruby
 script: bundle exec rake
 rvm:
-  - '2.2'
-  - '2.1'
+  - '2.3.5'
+  - '2.2.8'
+  - '2.1.9'
   - '2.0'
-  - '1.9'
-  - '1.8'
-  - jruby-19mode
-  - jruby-18mode
+deploy:
+  provider: rubygems
+  api_key:
+    secure: "HkdoYaLek2mCT+e7pW0pHMLiIuikUMihfqzspltzmN673HBvMCMZqk4sIm4b3Zi+RMtNTb4dnMxxhehKyyzF88UIRHqV9OUPT3LQLE/BgHThxLD1+CSbVS1SZKY7UfTIcqW3/otORBCI5YAXiycEnRFIe2R/S3n0c/gD9dBcobg="
+  gem: librarianp
+  on:
+    tags: true

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+## 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.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    librarianp (0.6.3)
+    librarianp (0.6.4)
       thor (~> 0.15)
 
 GEM

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) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/carlossg/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
+0.6.4

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/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/librarianp.gemspec

@@ -0,0 +1,26 @@
+# -*- 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", __FILE__)).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.add_dependency "thor", "~> 0.15"
+
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec", "~> 2.14"
+  gem.add_development_dependency "json"
+  gem.add_development_dependency "fakefs", "~> 0.4.2"
+end

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

@@ -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/unit/action/resolve_spec.rb

@@ -36,6 +36,7 @@ module Librarian
 
           it "should merge duplicated dependencies" do
             Dependency.any_instance.stub(:manifests => [manifest])
+            Librarian::Logger.any_instance.stub(:info)
             action.stub(:persist_resolution)
             resolution = action.run
             expect(resolution.dependencies).to eq([dependency2])

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
@@ -69,7 +69,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 +125,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 +135,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: 0.6.4
 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: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -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: {}
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A Framework for Bundlers.

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