librarianp 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a5b8a8fefca65597bdf2ead8377293039a73a8
-  data.tar.gz: b9e2a7797f3b19acfc1b7b06cc1247380698f247
+  metadata.gz: 32e59b1fc3a6aaa7e1f6affb7bc95ac940151489
+  data.tar.gz: 183d10a379c2e3d925c9e1e7f45483f9f43b24bc
 SHA512:
-  metadata.gz: c46e3c05255a2671b969b552d1bc6bf00989dac8748bbbe3a41baeb68ec0071b93d4640e60c73a77979cfb04453276f0fe204605327eb2e7d87ef877bf77d0f6
-  data.tar.gz: 20c6573ed3ba861117641d37abeb2a8f72227278657b1f1b7cf3cbfe202ad461a246b06e0ea04e5fc111b1b2540fe904670a7ef99053c1c8a41db23fa0ab09eb
+  metadata.gz: 0ede0dafff66900070bf14ea10d9a206c9081fbbeca8114982e1eb6bdf99a129135107cf0bda02d1490d15cd99dd80e790ec7b6939077c1489b7b20ea9726d84
+  data.tar.gz: b99e91e02d4f3ae3acc4f74b30bbc2a01cf5149ff36f12c6c8c45790e43ac97c509029c38a47f31aa633d9952063dde58cd1d049316186f8b576d79a50bc654e

data/.travis.yml

@@ -1,10 +1,11 @@
+sudo: false
 language: ruby
-script: rspec spec -b
+script: bundle exec rake
 rvm:
-  - 2.2.x
-  - 2.1.x
-  - 2.0.x
-  - 1.9.x
-  - 1.8.x
+  - '2.2'
+  - '2.1'
+  - '2.0'
+  - '1.9'
+  - '1.8'
   - jruby-19mode
   - jruby-18mode

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    librarianp (0.1.2)
-      highline
+    librarianp (0.2.0)
       thor (~> 0.15)
 
 GEM
@@ -11,9 +10,8 @@ GEM
     diff-lcs (1.2.5)
     fakefs (0.4.2)
     ffi2-generators (0.1.1)
-    highline (1.7.0)
-    json (1.7.7)
-    rake (10.0.4)
+    json (1.8.2)
+    rake (10.4.2)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/librarian/action/install.rb

@@ -40,7 +40,7 @@ module Librarian
       end
 
       def create_install_path
-        install_path.rmtree if install_path.exist?
+        install_path.rmtree if install_path.exist? && destructive?
         install_path.mkpath
       end
 
@@ -54,6 +54,10 @@ module Librarian
         ManifestSet.sort(lock.manifests)
       end
 
+      def destructive?
+        environment.config_db.local['destructive'] == 'true'
+      end
+
       def specfile_name
         environment.specfile_name
       end

data/lib/librarian/dependency.rb

@@ -7,7 +7,7 @@ module Librarian
       def initialize(*args)
         args = initialize_normalize_args(args)
 
-        self.backing = Gem::Requirement.create(*args)
+        self.backing = Gem::Requirement.create(args)
       end
 
       def to_gem_requirement
@@ -22,6 +22,12 @@ module Librarian
         to_gem_requirement == other.to_gem_requirement
       end
 
+      alias :eql? :==
+
+      def hash
+        self.to_s.hash
+      end
+
       def to_s
         to_gem_requirement.to_s
       end
@@ -84,8 +90,30 @@ module Librarian
       def initialize_normalize_args(args)
         args.map do |arg|
           arg = arg.backing if self.class === arg
-          arg
-        end
+          case arg
+          when nil
+            nil
+          when Array
+            arg.map { |item| parse(item) }
+          when String
+            parse(arg)
+          else
+            # Gem::Requirement, convert to string (ie. =1.0) so we can concat later
+            # Gem::Requirements can not be concatenated
+            arg.requirements.map{|x,y| "#{x}#{y}"}
+          end
+        end.flatten
+      end
+
+      # build an array if the argument is a string defining a range
+      # or a ~> 1.0 type version if string is 1.x
+      def parse(arg)
+        return nil if arg.nil?
+        match = range_requirement(arg)
+        return [match[1], match[2]] if match
+        match = pessimistic_requirement(arg)
+        return "~> #{match[1]}.0" if match
+        arg
       end
 
       def compatible?(a, b)
@@ -94,6 +122,16 @@ module Librarian
         r = r.call(a.last, b.last) if r.respond_to?(:call)
         r
       end
+
+      # A version range: >=1.0 <2.0
+      def range_requirement(arg)
+        arg.match(/(>=? ?\d+(?:\.\d+){0,2}) (<=? ?\d+(?:\.\d+){0,2})/)
+      end
+
+      # A string with .x: 1.x, 2.1.x
+      def pessimistic_requirement(arg)
+        arg.match(/(\d+(?:\.\d+)?)\.x/)
+      end
     end
 
     attr_accessor :name, :requirement, :source

data/lib/librarian/logger.rb

@@ -12,6 +12,12 @@ module Librarian
       self.environment = environment
     end
 
+    def warn(string = nil, &block)
+      return unless ui
+
+      ui.warn(string || yield)
+    end
+
     def info(string = nil, &block)
       return unless ui
 

data/lib/librarian/manifest.rb

@@ -6,10 +6,21 @@ module Librarian
     class Version
       include Comparable
 
+      @@SEMANTIC_VERSION_PATTERN = /^([0-9]+\.[0-9]+(?:\.[0-9]+)?)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?$/
+
+      attr_reader :prerelease
+
       def initialize(*args)
         args = initialize_normalize_args(args)
-
-        self.backing = Gem::Version.new(*args)
+        semver = Version.parse_semver(*args)
+        if semver
+          self.backing  = Gem::Version.new(semver[:version])
+          @prerelease   = semver[:prerelease]
+          @full_version = semver[:full_version]
+        else
+          self.backing  = Gem::Version.new(*args)
+          @full_version = to_gem_version.to_s
+        end
       end
 
       def to_gem_version
@@ -17,17 +28,43 @@ module Librarian
       end
 
       def <=>(other)
-        to_gem_version <=> other.to_gem_version
+        cmp = to_gem_version <=> other.to_gem_version
+
+        # Should compare pre-release versions?
+        if cmp == 0 and not (prerelease.nil? and other.prerelease.nil?)
+          case # Versions without prerelease take precedence
+            when (prerelease.nil? and not other.prerelease.nil?)
+              1
+            when (not prerelease.nil? and other.prerelease.nil?)
+              -1
+            else
+              prerelease <=> other.prerelease
+          end
+        else
+          cmp
+        end
       end
 
       def to_s
-        to_gem_version.to_s
+        @full_version
       end
 
       def inspect
         "#<#{self.class} #{to_s}>"
       end
 
+      def self.parse_semver(version_string)
+        parsed = @@SEMANTIC_VERSION_PATTERN.match(version_string.strip)
+        if parsed
+          {
+            :full_version => parsed[0],
+            :version => parsed[1],
+            :prerelease => (PreReleaseVersion.new(parsed[2]) if parsed[2]),
+            :build => parsed[3]
+          }
+        end
+      end
+
       private
 
       def initialize_normalize_args(args)
@@ -40,6 +77,66 @@ module Librarian
       attr_accessor :backing
     end
 
+    class PreReleaseVersion
+
+      # Compares pre-release component ids using Semver 2.0.0 spec
+      def self.compare_components(this_id,other_id)
+        case # Strings have higher precedence than numbers
+          when (this_id.is_a?(Integer) and other_id.is_a?(String))
+            -1
+          when (this_id.is_a?(String) and other_id.is_a?(Integer))
+            1
+          else
+            this_id <=> other_id
+        end
+      end
+
+      # Parses pre-release components `a.b.c` into an array ``[a,b,c]`
+      # Converts numeric components into +Integer+
+      def self.parse(prerelease)
+        if prerelease.nil?
+          []
+        else
+          prerelease.split('.').collect do |id|
+            id = Integer(id) if /^[0-9]+$/ =~ id
+            id
+          end
+        end
+      end
+
+      include Comparable
+
+      attr_reader :components
+
+      def initialize(prerelease)
+        @prerelease = prerelease
+        @components = PreReleaseVersion.parse(prerelease)
+      end
+
+      def to_s
+        @prerelease
+      end
+
+      def <=>(other)
+        # null-fill zip array to prevent loss of components
+        z = Array.new([components.length,other.components.length])
+
+        # Compare each component against the other
+        comp = z.zip(components,other.components).collect do |ids|
+          case # All components being equal, the version with more of them takes precedence
+            when ids[1].nil? # Self has less elements, other wins
+              -1
+            when ids[2].nil? # Other has less elements, self wins
+              1
+            else
+              PreReleaseVersion.compare_components(ids[1],ids[2])
+          end
+        end
+        # Chose the first non-zero comparison or return 0
+        comp.delete_if {|c| c == 0}[0] || 0
+      end
+    end
+
     attr_accessor :source, :name, :extra
     private :source=, :name=, :extra=
 

data/lib/librarian/manifest_set.rb

@@ -137,6 +137,7 @@ module Librarian
         next if deps.include?(name)
 
         deps << name
+        raise(Error, "Unable to find module #{name}. The dependency descriptor may be out of sync with the lock, try running 'install' first") if index[name].nil?
         names.concat index[name].dependencies.map(&:name)
       end
       deps.to_a

data/lib/librarian/mock/source/mock.rb

@@ -30,6 +30,12 @@ module Librarian
           self.name   == other.name
         end
 
+        alias :eql? :==
+
+        def hash
+          self.to_s.hash
+        end
+
         def to_spec_args
           [name, {}]
         end

data/lib/librarian/source/git.rb

@@ -52,6 +52,12 @@ module Librarian
         (self.sha.nil? || other.sha.nil? || self.sha == other.sha)
       end
 
+      alias :eql? :==
+
+      def hash
+        self.to_s.hash
+      end
+
       def to_spec_args
         options = {}
         options.merge!(:ref => ref) if ref != DEFAULTS[:ref]

data/lib/librarian/source/path.rb

@@ -29,6 +29,12 @@ module Librarian
         self.path   == other.path
       end
 
+      alias :eql? :==
+
+      def hash
+        self.to_s.hash
+      end
+
       def to_spec_args
         [path.to_s, {}]
       end

data/librarian.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: librarianp 0.1.2 ruby lib
+# stub: librarianp 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "librarianp"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   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-02-24"
+  s.date = "2015-02-25"
   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_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/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"]
@@ -23,14 +23,12 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thor>, ["~> 0.15"])
-      s.add_runtime_dependency(%q<highline>, [">= 0"])
       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<highline>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.14"])
       s.add_dependency(%q<json>, [">= 0"])
@@ -38,7 +36,6 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<thor>, ["~> 0.15"])
-    s.add_dependency(%q<highline>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.14"])
     s.add_dependency(%q<json>, [">= 0"])

data/spec/unit/action/install_spec.rb

@@ -74,6 +74,7 @@ module Librarian
           before do
             env.stub(:install_path) { install_path }
             action.stub(:check_preconditions)
+            action.stub(:destructive?) { true }
             action.stub_chain(:lock, :manifests) { manifests }
           end
 

data/spec/unit/algorithms_spec.rb

@@ -123,6 +123,16 @@ module Librarian
           it { should be == [?a, ?b, ?c, ?d] }
         end
 
+        # Dependencies are sorted alphabetically. Should they?
+        context "should be deterministic" do
+          let(:graph) { { ?a => [], ?b => [?c], ?c => [] } }
+          it { should be == [?a, ?c, ?b] }
+        end
+
+        context "should be deterministic" do
+          let(:graph) { { ?c => [], ?b => [?a], ?a => [] } }
+          it { should be == [?a, ?b, ?c] }
+        end
       end
 
     end

data/spec/unit/dependency/requirement_spec.rb

@@ -9,4 +9,28 @@ describe Librarian::Dependency::Requirement do
       to eq "#<Librarian::Dependency::Requirement >= 3.2.1>" }
   end
 
+  it 'should handle nil versions' do
+    described_class.new(nil).to_gem_requirement.should 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)
+  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'))
+  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']))
+  end
+
+  it 'should print to_s' do
+    described_class.new('1.x').to_s.should 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")
+  end
+
 end

data/spec/unit/manifest/version_spec.rb

@@ -8,4 +8,94 @@ describe Librarian::Manifest::Version do
     specify { expect(version.inspect).to eq "#<Librarian::Manifest::Version 3.2.1>" }
   end
 
+  describe "version comparison" do
+
+    context "when version has only two components" do
+      it "creates a new version with only 2 version components" do
+        v1 = described_class.new("1.0")
+      end
+    end
+
+    context "when neither version has pre-release items" do
+      it "compares 1.0.0 < 2.0.0" do
+        v1 = described_class.new("1.0.0")
+        v2 = described_class.new("2.0.0")
+        expect(v1 <=> v2).to eq(-1)
+      end
+      it "compares 2.0.0 < 2.1.0" do
+        v1 = described_class.new("2.0.0")
+        v2 = described_class.new("2.1.0")
+        expect(v1 <=> v2).to eq(-1)
+      end
+      it "compares 2.1.0 < 2.1.1" do
+        v1 = described_class.new("2.1.0")
+        v2 = described_class.new("2.1.1")
+        expect(v1 <=> v2).to eq(-1)
+      end
+    end
+
+    context "when versions have pre-release information" do
+      it "compares 1.0.0-alpha < 1.0.0-alpha1" do
+        v1 = described_class.new("1.0.0-alpha")
+        v2 = described_class.new("1.0.0-alpha.1")
+        expect(v1 <=> v2).to eq(-1)
+      end
+      it "compares 1.0.0-alpha.1 < 1.0.0-alpha.beta" do
+        v1 = described_class.new("1.0.0-alpha.1")
+        v2 = described_class.new("1.0.0-alpha.beta")
+        expect(v1 <=> v2).to eq(-1)
+      end
+      it "compares 1.0.0-alpha.beta < 1.0.0-beta" do
+        v1 = described_class.new("1.0.0-alpha.beta")
+        v2 = described_class.new("1.0.0-beta")
+        expect(v1 <=> v2).to eq(-1)
+      end
+      it "compares 1.0.0-beta < 1.0.0-beta.2" do
+        v1 = described_class.new("1.0.0-beta")
+        v2 = described_class.new("1.0.0-beta.2")
+        expect(v1 <=> v2).to eq(-1)
+      end
+      it "compares 1.0.0-beta.2 < 1.0.0-beta.11" do
+        v1 = described_class.new("1.0.0-beta.2")
+        v2 = described_class.new("1.0.0-beta.11")
+        expect(v1 <=> v2).to eq(-1)
+      end
+      it "compares 1.0.0-beta.11 < 1.0.0-rc.1" do
+        v1 = described_class.new("1.0.0-beta.11")
+        v2 = described_class.new("1.0.0-rc.1")
+        expect(v1 <=> v2).to eq(-1)
+      end
+      it "compares 1.0.0-rc.1 < 1.0.0" do
+        v1 = described_class.new("1.0.0-rc.1")
+        v2 = described_class.new("1.0.0")
+        expect(v1 <=> v2).to eq(-1)
+      end
+    end
+
+    context "when an invalid version number is provided" do
+      it "raises" do
+        expect { described_class.new("invalidversion") }.
+            to raise_error(ArgumentError)
+      end
+    end
+
+    context "when a version is converted to string" do
+      it "should be the full semver" do
+        version = "1.0.0-beta.11+200.1.2"
+        v1 = described_class.new(version)
+        expect(v1.to_s).to eq(version)
+      end
+      it "should be the full gem version" do
+        version = "1.0.0.a"
+        v1 = described_class.new(version)
+        expect(v1.to_s).to eq(version)
+      end
+      it "should be the two-component version" do
+        version = "1.0"
+        v1 = described_class.new(version)
+        expect(v1.to_s).to eq(version)
+      end
+    end
+  end
+
 end

data/spec/unit/manifest_set_spec.rb

@@ -143,6 +143,10 @@ module Librarian
 
         expect(set.to_a).to match_array( [] )
       end
+
+      it "should fail if index does not contain manifest" do
+        expect { set.deep_strip!(["a", "z"]) }.to raise_error(Librarian::Error, /^Unable to find module z/)
+      end
     end
 
     describe "#deep_keep!" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarianp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jay Feldblum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -25,20 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement