librarian-puppet-maestrodev 0.9.7.5 → 0.9.8.1

data/README.md

@@ -88,7 +88,7 @@ If we do not, then librarian-puppet will assume we meant the `master` branch.
 
 If we use a `:ref =>`, we can use anything that Git will recognize as a ref.
 This includes any branch name, tag name, SHA, or SHA unique prefix. If we use a
-branch, we can later ask Librarian-pupet to update the modulek by fetching the
+branch, we can later ask Librarian-puppet to update the module by fetching the
 most recent version of the module from that same branch.
 
 The Git source also supports a `:path =>` option. If we use the path option,
@@ -164,8 +164,8 @@ Update the version of a dependency:
 Bug reports to the github issue tracker please.
 Please include:
 
- * relevant `Puppetfile` and `Puppetfile.lock` files.
- * version of ruby, librarian-puppet
+ * Relevant `Puppetfile` and `Puppetfile.lock` files
+ * Version of ruby, librarian-puppet
  * What distro
  * Please run the `librarian-puppet` commands in verbose mode by using the
   `--verbose` flag, and include the verbose output in the bug report as well.

data/bin/librarian-puppet

@@ -1,9 +1,7 @@
 #!/usr/bin/env ruby
 
 lib = File.expand_path('../../lib', __FILE__)
-vendor = File.expand_path('../../vendor/librarian/lib', __FILE__)
 $:.unshift(lib) unless $:.include?(lib)
-$:.unshift(vendor) unless $:.include?(vendor)
 
 require 'librarian/puppet/cli'
 Librarian::Puppet::Cli.bin!

data/lib/librarian/puppet.rb

@@ -1,7 +1,16 @@
 require 'librarian'
-require 'puppet'
 require 'fileutils'
 
+begin
+  require 'puppet'
+rescue LoadError
+  $stderr.puts <<-EOF
+Unable to load puppet. Either install it using native packages for your
+platform (eg .deb, .rpm, .dmg, etc) or as a gem (gem install puppet).
+EOF
+  exit 1
+end
+
 require 'librarian/puppet/extension'
 require 'librarian/puppet/version'
 

data/lib/librarian/puppet/extension.rb

@@ -1,4 +1,5 @@
 require 'librarian/puppet/environment'
+require 'librarian/action/base'
 
 module Librarian
   module Puppet
@@ -20,9 +21,9 @@ module Librarian
         args.map do |arg|
           case arg
           when Array
-            arg.map { |v| puppet_to_gem_version(v) }
+            arg.map { |v| Librarian::Puppet::Requirement.new(v).gem_requirement }
           when String
-            puppet_to_gem_version(arg)
+            Librarian::Puppet::Requirement.new(arg).gem_requirement
           else
             # Gem::Requirement, convert to string (ie. =1.0) so we can concat later
             # Gem::Requirements can not be concatenated
@@ -30,18 +31,74 @@ module Librarian
           end
         end.flatten
       end
+    end
+  end
 
-      # convert Puppet versions to gem supported versions
-      # '1.x' to '~>1.0'
-      # '>=1.1.0 <2.0.0' to ['>=1.1.0', '<2.0.0']
-      # http://docs.puppetlabs.com/puppet/2.7/reference/modules_publishing.html
-      def puppet_to_gem_version(version)
-        constraints = version.scan(/([~<>=]*[ ]*[\d\.x]+)/).flatten # split the constraints
-        constraints.map do |constraint|
-          matched = /(.*)\.x/.match(constraint)
-          matched.nil? ? constraint : "~>#{matched[1]}.0"
+  # Fixes for librarian not yet released in their gem
+  module Mock
+    module Source
+      class Mock
+        alias :eql? :==
+
+        def hash
+          self.to_s.hash
         end
       end
     end
   end
+  module Source
+    class Git
+      alias :eql? :==
+
+      def hash
+        self.to_s.hash
+      end
+    end
+
+    class Path
+      alias :eql? :==
+
+      def hash
+        self.to_s.hash
+      end
+    end
+  end
+
+
+  module Action
+    class Install < Base
+
+    private
+
+      def create_install_path
+        install_path.rmtree if install_path.exist? && destructive?
+        install_path.mkpath
+      end
+
+      def destructive?
+        environment.config_db.local['destructive'] == 'true'
+      end
+    end
+  end
+
+  class ManifestSet
+    private
+
+    # Check if module doesn't exist and fail fast
+    def dependencies_of(names)
+      names = Array === names ? names.dup : names.to_a
+      assert_strings!(names)
+
+      deps = Set.new
+      until names.empty?
+        name = names.shift
+        next if deps.include?(name)
+
+        deps << name
+        raise(Error, "Unable to find module #{name}") if index[name].nil?
+        names.concat index[name].dependencies.map(&:name)
+      end
+      deps.to_a
+    end
+  end
 end

data/lib/librarian/puppet/requirement.rb

@@ -0,0 +1,39 @@
+module Librarian
+  module Puppet
+    class Requirement
+      attr_reader :requirement
+
+      def initialize(requirement)
+        @requirement = requirement
+      end
+
+      # convert Puppet versions to gem supported versions
+      # '1.x' to '~>1.0'
+      # '>=1.1.0 <2.0.0' to ['>=1.1.0', '<2.0.0']
+      # http://docs.puppetlabs.com/puppet/2.7/reference/modules_publishing.html
+      def gem_requirement
+        if range_requirement?
+          [@range_match[1], @range_match[2]]
+        elsif pessimistic_requirement?
+          "~> #{@pessimistic_match[1]}.0"
+        else
+          requirement
+        end
+      end
+
+      def to_s
+        gem_requirement.to_s
+      end
+
+      private
+
+      def range_requirement?
+        @range_match ||= requirement.match(/(>=? ?\d+(?:\.\d+){0,2}) (<=? ?\d+(?:\.\d+){0,2})/)
+      end
+
+      def pessimistic_requirement?
+        @pessimistic_match ||= requirement.match(/(\d+(?:\.\d+)?)\.x/)
+      end
+    end
+  end
+end

data/lib/librarian/puppet/source.rb

@@ -1,3 +1,4 @@
+require 'librarian/puppet/requirement'
 require 'librarian/puppet/source/path'
 require 'librarian/puppet/source/git'
 require 'librarian/puppet/source/forge'

data/lib/librarian/puppet/source/forge.rb

@@ -110,7 +110,7 @@ module Librarian
 
           def check_puppet_module_options
             min_version    = Gem::Version.create('2.7.13')
-            puppet_version = Gem::Version.create(`puppet --version`.strip.gsub('-', '.'))
+            puppet_version = Gem::Version.create(`puppet --version`.split(' ').first.strip.gsub('-', '.'))
 
             if puppet_version < min_version
               raise Error, "To get modules from the forge, we use the puppet faces module command. For this you need at least puppet version 2.7.13 and you have #{puppet_version}"
@@ -214,6 +214,12 @@ module Librarian
           self.uri.hash
         end
 
+        alias :eql? :==
+
+        def hash
+          self.to_s.hash
+        end
+
         def to_spec_args
           [uri, {}]
         end
@@ -271,6 +277,7 @@ module Librarian
           environment.logger.debug { "      Fetching dependencies for #{name} #{version}" }
           repo(name).dependencies(version).map do |k, v|
             begin
+              v = Requirement.new(v).gem_requirement
               Dependency.new(k, v, nil)
             rescue ArgumentError => e
               raise Error, "Error fetching dependency for #{name} [#{version}]: #{k} [#{v}]: #{e}"

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

@@ -103,10 +103,12 @@ module Librarian
             debug { "Ignoring invalid version '#{v}' for module #{name}, using 0.0.1" }
             v = '0.0.1'
           end
+          v
         end
 
         def fetch_dependencies(name, version, extra)
           repository.dependencies.map do |k, v|
+            v = Requirement.new(v).gem_requirement
             Dependency.new(k, v, forge_source)
           end
         end

data/lib/librarian/puppet/source/githubtarball.rb

@@ -23,7 +23,16 @@ module Librarian
             end
 
             all_versions = data.map { |r| r['name'] }.sort.reverse
-            all_versions.reject { |version| version =~ /^v/ }.compact
+
+            all_versions = all_versions.map do |version|
+              version.gsub(/^v/, '')
+            end
+
+            all_versions.delete_if do |version|
+              version !~ /\A\d\.\d(\.\d.*)?\z/
+            end
+
+            all_versions.compact
           end
 
           def manifests
@@ -161,6 +170,12 @@ module Librarian
           self.uri == other.uri
         end
 
+        alias :eql? :==
+
+        def hash
+          self.to_s.hash
+        end
+
         def to_spec_args
           [uri, {}]
         end

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "0.9.7.5"
+    VERSION = "0.9.8.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet-maestrodev
 version: !ruby/object:Gem::Version
-  version: 0.9.7.5
+  version: 0.9.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: librarian
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +60,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: puppet
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -60,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -120,116 +136,21 @@ files:
 - LICENSE
 - README.md
 - bin/librarian-puppet
-- lib/librarian/puppet/cli.rb
+- lib/librarian/puppet.rb
 - lib/librarian/puppet/dsl.rb
+- lib/librarian/puppet/source.rb
+- lib/librarian/puppet/lockfile/parser.rb
+- lib/librarian/puppet/cli.rb
 - lib/librarian/puppet/environment.rb
+- lib/librarian/puppet/requirement.rb
+- lib/librarian/puppet/version.rb
+- lib/librarian/puppet/templates/Puppetfile
 - lib/librarian/puppet/extension.rb
-- lib/librarian/puppet/lockfile/parser.rb
 - lib/librarian/puppet/source/forge.rb
-- lib/librarian/puppet/source/git.rb
 - lib/librarian/puppet/source/githubtarball.rb
-- lib/librarian/puppet/source/local.rb
+- lib/librarian/puppet/source/git.rb
 - lib/librarian/puppet/source/path.rb
-- lib/librarian/puppet/source.rb
-- lib/librarian/puppet/templates/Puppetfile
-- lib/librarian/puppet/version.rb
-- lib/librarian/puppet.rb
-- vendor/librarian/bin/librarian-chef
-- vendor/librarian/bin/librarian-mock
-- vendor/librarian/CHANGELOG.md
-- vendor/librarian/config/cucumber.yaml
-- vendor/librarian/features/chef/cli/init.feature
-- vendor/librarian/features/chef/cli/install.feature
-- vendor/librarian/features/chef/cli/show.feature
-- vendor/librarian/features/chef/cli/version.feature
-- vendor/librarian/features/support/env.rb
-- vendor/librarian/Gemfile
-- vendor/librarian/lib/librarian/action/base.rb
-- vendor/librarian/lib/librarian/action/clean.rb
-- vendor/librarian/lib/librarian/action/ensure.rb
-- vendor/librarian/lib/librarian/action/install.rb
-- vendor/librarian/lib/librarian/action/resolve.rb
-- vendor/librarian/lib/librarian/action/update.rb
-- vendor/librarian/lib/librarian/action.rb
-- vendor/librarian/lib/librarian/chef/cli.rb
-- vendor/librarian/lib/librarian/chef/dsl.rb
-- vendor/librarian/lib/librarian/chef/environment.rb
-- vendor/librarian/lib/librarian/chef/extension.rb
-- vendor/librarian/lib/librarian/chef/integration/knife.rb
-- vendor/librarian/lib/librarian/chef/manifest_reader.rb
-- vendor/librarian/lib/librarian/chef/source/git.rb
-- vendor/librarian/lib/librarian/chef/source/local.rb
-- vendor/librarian/lib/librarian/chef/source/path.rb
-- vendor/librarian/lib/librarian/chef/source/site.rb
-- vendor/librarian/lib/librarian/chef/source.rb
-- vendor/librarian/lib/librarian/chef/templates/Cheffile
-- vendor/librarian/lib/librarian/chef.rb
-- vendor/librarian/lib/librarian/cli/manifest_presenter.rb
-- vendor/librarian/lib/librarian/cli.rb
-- vendor/librarian/lib/librarian/config/database.rb
-- vendor/librarian/lib/librarian/config/file_source.rb
-- vendor/librarian/lib/librarian/config/hash_source.rb
-- vendor/librarian/lib/librarian/config/source.rb
-- vendor/librarian/lib/librarian/config.rb
-- vendor/librarian/lib/librarian/dependency.rb
-- vendor/librarian/lib/librarian/dsl/receiver.rb
-- vendor/librarian/lib/librarian/dsl/target.rb
-- vendor/librarian/lib/librarian/dsl.rb
-- vendor/librarian/lib/librarian/environment.rb
-- vendor/librarian/lib/librarian/error.rb
-- vendor/librarian/lib/librarian/helpers.rb
-- vendor/librarian/lib/librarian/lockfile/compiler.rb
-- vendor/librarian/lib/librarian/lockfile/parser.rb
-- vendor/librarian/lib/librarian/lockfile.rb
-- vendor/librarian/lib/librarian/logger.rb
-- vendor/librarian/lib/librarian/manifest.rb
-- vendor/librarian/lib/librarian/manifest_set.rb
-- vendor/librarian/lib/librarian/mock/cli.rb
-- vendor/librarian/lib/librarian/mock/dsl.rb
-- vendor/librarian/lib/librarian/mock/environment.rb
-- vendor/librarian/lib/librarian/mock/extension.rb
-- vendor/librarian/lib/librarian/mock/source/mock/registry.rb
-- vendor/librarian/lib/librarian/mock/source/mock.rb
-- vendor/librarian/lib/librarian/mock/source.rb
-- vendor/librarian/lib/librarian/mock.rb
-- vendor/librarian/lib/librarian/resolution.rb
-- vendor/librarian/lib/librarian/resolver/implementation.rb
-- vendor/librarian/lib/librarian/resolver.rb
-- vendor/librarian/lib/librarian/source/git/repository.rb
-- vendor/librarian/lib/librarian/source/git.rb
-- vendor/librarian/lib/librarian/source/local.rb
-- vendor/librarian/lib/librarian/source/path.rb
-- vendor/librarian/lib/librarian/source.rb
-- vendor/librarian/lib/librarian/spec.rb
-- vendor/librarian/lib/librarian/spec_change_set.rb
-- vendor/librarian/lib/librarian/specfile.rb
-- vendor/librarian/lib/librarian/support/abstract_method.rb
-- vendor/librarian/lib/librarian/ui.rb
-- vendor/librarian/lib/librarian/version.rb
-- vendor/librarian/lib/librarian.rb
-- vendor/librarian/librarian.gemspec
-- vendor/librarian/MIT-LICENSE
-- vendor/librarian/Rakefile
-- vendor/librarian/README.md
-- vendor/librarian/spec/functional/chef/source/git_spec.rb
-- vendor/librarian/spec/functional/chef/source/site_spec.rb
-- vendor/librarian/spec/functional/source/git/repository_spec.rb
-- vendor/librarian/spec/unit/action/base_spec.rb
-- vendor/librarian/spec/unit/action/clean_spec.rb
-- vendor/librarian/spec/unit/action/ensure_spec.rb
-- vendor/librarian/spec/unit/action/install_spec.rb
-- vendor/librarian/spec/unit/config/database_spec.rb
-- vendor/librarian/spec/unit/dependency_spec.rb
-- vendor/librarian/spec/unit/dsl_spec.rb
-- vendor/librarian/spec/unit/environment_spec.rb
-- vendor/librarian/spec/unit/lockfile/parser_spec.rb
-- vendor/librarian/spec/unit/lockfile_spec.rb
-- vendor/librarian/spec/unit/manifest_set_spec.rb
-- vendor/librarian/spec/unit/manifest_spec.rb
-- vendor/librarian/spec/unit/mock/source/mock_spec.rb
-- vendor/librarian/spec/unit/resolver_spec.rb
-- vendor/librarian/spec/unit/source/git_spec.rb
-- vendor/librarian/spec/unit/spec_change_set_spec.rb
+- lib/librarian/puppet/source/local.rb
 homepage: https://github.com/rodjek/librarian-puppet
 licenses: []
 post_install_message: 
@@ -244,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3491608161437064369
+      hash: -4235040129931372868
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -253,10 +174,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3491608161437064369
+      hash: -4235040129931372868
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Bundler for your Puppet modules