librarian-puppet 0.9.10 → 0.9.11

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  data.tar.gz: 26f2450bec2359ed38738c868f21164737d055ee5d8f1eed837fa955dcf6c13ac2e43b71c231a84da5c57c108e371af3f33716929f65ca6a71d66ba0349e87f7
+  metadata.gz: 196b417f93a75ce20fe8292826c5cfc3a49d4a9b6ba3e950523575e9e9691ec2339013554fe41a75270a933b6bbdef8446cdba0654991a636c0cbdfa5b64238b
+SHA1: 
+  data.tar.gz: 03f66d8a1c37f5bcfb97662e532de19e5dc56a4a
+  metadata.gz: f43deff66072951260d131337181757ceed57cbd

data/README.md

@@ -1,5 +1,7 @@
 # Librarian-puppet
 
+[![Build Status](https://travis-ci.org/rodjek/librarian-puppet.png?branch=master)](https://travis-ci.org/rodjek/librarian-puppet)
+
 ## Introduction
 
 Librarian-puppet is a bundler for your puppet infrastructure.  You can use
@@ -22,6 +24,15 @@ Every Puppet repository that uses Librarian-puppet will have a file named
 `Puppetfile` in the root directory of that repository.  The full specification
 for which modules your puppet infrastructure repository  depends goes in here.
 
+### Simple Puppetfile
+
+This Puppetfile will download all the dependencies listed in your Modulefile from the Puppet Forge
+
+    forge "http://forge.puppetlabs.com"
+
+    modulefile
+
+
 ### Example Puppetfile
 
     forge "http://forge.puppetlabs.com"
@@ -38,6 +49,11 @@ for which modules your puppet infrastructure repository  depends goes in here.
 *See [jenkins-appliance](https://github.com/aussielunix/jenkins-appliance) for
 a puppet repo already setup to use librarian-puppet.*
 
+### Recursive module dependency resolving
+
+When fetching a module from a `:git`-source all dependencies specified in its
+`Modulefile` and `Puppetfile` will be resolved and installed.
+
 ### Puppetfile Breakdown
 
     forge "http://forge.puppetlabs.com"
@@ -146,6 +162,72 @@ Update the version of a dependency:
     $ git add Puppetfile.lock
     $ git commit -m "bumped the version of apt up to 0.0.4."
 
+## Configuration
+
+Configuration comes from three sources with the following highest-to-lowest
+precedence:
+
+* The local config (`./.librarian/puppet/config`)
+* The environment
+* The global config (`~/.librarian/puppet/config`)
+
+You can inspect the final configuration with:
+
+    $ librarian-puppet config
+
+You can find out where a particular key is set with:
+
+    $ librarian-puppet config KEY
+
+You can set a key at the global level with:
+
+    $ librarian-puppet config KEY VALUE --global
+
+And remove it with:
+
+    $ librarian-puppet config KEY --global --delete
+
+You can set a key at the local level with:
+
+    $ librarian-puppet config KEY VALUE --local
+
+And remove it with:
+
+    $ librarian-puppet config KEY --local --delete
+
+You cannot set or delete environment-level config keys with the CLI.
+
+Configuration set at either the global or local level will affect subsequent
+invocations of `librarian-puppet`. Configurations set at the environment level are
+not saved and will not affect subsequent invocations of `librarian-puppet`.
+
+You can pass a config at the environment level by taking the original config key
+and transforming it: replace hyphens (`-`) with underscores (`_`) and periods
+(`.`) with doubled underscores (`__`), uppercase, and finally prefix with
+`LIBRARIAN_PUPPET_`. For example, to pass a config in the environment for the key
+`part-one.part-two`, set the environment variable
+`LIBRARIAN_PUPPET_PART_ONE__PART_TWO`.
+
+Configuration affects how various commands operate.
+
+* The `path` config sets the cookbooks directory to install to. If a relative
+  path, it is relative to the directory containing the `Puppetfile`. The
+  equivalent environment variable is `LIBRARIAN_PUPPET_PATH`.
+
+* The `tmp` config sets the cache directory for librarian. If a relative
+  path, it is relative to the directory containing the `Puppetfile`. The
+  equivalent environment variable is `LIBRARIAN_PUPPET_TMP`.
+
+Configuration can be set by passing specific options to other commands.
+
+* The `path` config can be set at the local level by passing the `--path` option
+  to the `install` command. It can be unset at the local level by passing the
+  `--no-path` option to the `install` command. Note that if this is set at the
+  environment or global level then, even if `--no-path` is given as an option,
+  the environment or global config will be used.
+
+
+
 ## How to Contribute
 
  * Pull requests please.
@@ -162,25 +244,6 @@ Please include:
  * 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.
 
-## Changelog
-
-### 0.9.0
-
- * Initial release
-
-### 0.9.1
-
- * Proper error message when a module that is sourced from the forge does not
-   exist.
- * Added support for annotated tags as git references.
- * `librarian-puppet init` adds `.tmp/` to gitignore instead of `tmp/`.
- * Fixed syntax error in the template Puppetfile created by `librarian-puppet
-   init`.
- * Checks for `lib/puppet` as well as `manifests/` when checking if the git
-   repository is a valid module.
- * When a user specifies `<foo>/<bar>` as the name of a module sources from a
-   git repository, assume the module name is actually `<bar>`.
- * Fixed gem description and summary in gemspec.
 
 ## License
 Please see the [LICENSE](https://github.com/rodjek/librarian-puppet/blob/master/LICENSE)

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,16 +1,44 @@
 require 'librarian'
 require 'fileutils'
+require 'open3'
+
+# require open3_backport in ruby 1.8 and install if not present
+# https://github.com/rodjek/librarian-puppet/issues/167
+if RUBY_VERSION < '1.9'
+  begin
+    require 'open3_backport'
+  rescue LoadError
+    require 'rubygems/dependency_installer.rb'
+    Gem::DependencyInstaller.new.install 'open3_backport'
+    require 'open3_backport'
+  end
+end
+
+status = nil
+out = nil
+error = nil
 
 begin
-  require 'puppet'
-rescue LoadError
+  Open3.popen3('puppet --version') {|stdin, stdout, stderr, wait_thr|
+    pid = wait_thr.pid # pid of the started process.
+    out = stdout.read
+    status = wait_thr.value # Process::Status object returned.
+  }
+rescue => e
+  error = e
+end
+
+if status.nil? or status.exitstatus != 0
   $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).
+Unable to load puppet. Please install it using native packages for your platform (eg .deb, .rpm, .dmg, etc).
+#{out.nil? or out.empty? ? "puppet --version returned #{status.exitstatus}" : out}
+#{error.message unless error.nil?}
 EOF
   exit 1
 end
 
+PUPPET_VERSION=out.split(' ').first.strip
+
 require 'librarian/puppet/extension'
 require 'librarian/puppet/version'
 

data/lib/librarian/puppet/cli.rb

@@ -45,6 +45,12 @@ module Librarian
       option "destructive", :type => :boolean, :default => false
       option "local", :type => :boolean, :default => false
       def install
+
+        unless File.exist?('Puppetfile')
+          say "Could not find Puppetfile in #{Dir.pwd}", :red
+          exit 1
+        end
+
         ensure!
         clean! if options["clean"]
         unless options["destructive"].nil?
@@ -61,6 +67,7 @@ module Librarian
         environment.config_db.local['mode'] = options['local'] ? 'local' : nil
 
         resolve!
+        debug { "Install: dependencies resolved"}
         install!
       end
 

data/lib/librarian/puppet/dsl.rb

@@ -14,3 +14,16 @@ module Librarian
     end
   end
 end
+
+module Librarian
+  class Dsl
+    class Receiver
+      def modulefile
+        File.read('Modulefile').lines.each do |line|
+          regexp = /\s*dependency\s+('|")([^'"]+)\1\s*(?:,\s*('|")([^'"]+)\3)?/
+          regexp =~ line && mod($2, $4)
+        end
+      end
+    end
+  end
+end

data/lib/librarian/puppet/environment.rb

@@ -11,6 +11,11 @@ module Librarian
         "puppet"
       end
 
+      def tmp_path
+        part = config_db["tmp"] || ".tmp"
+        project_path.join(part)
+      end
+
       def install_path
         part = config_db["path"] || "modules"
         project_path.join(part)
@@ -28,14 +33,6 @@ module Librarian
         vendor_path.join('source')
       end
 
-      def cache_path
-        project_path.join(".tmp/librarian/cache")
-      end
-
-      def scratch_path
-        project_path.join(".tmp/librarian/scratch")
-      end
-
       def vendor!
         vendor_cache.mkpath  unless vendor_cache.exist?
         vendor_source.mkpath unless vendor_source.exist?

data/lib/librarian/puppet/extension.rb

@@ -1,9 +1,221 @@
 require 'librarian/puppet/environment'
+require 'librarian/action/base'
 
 module Librarian
   module Puppet
     extend self
     extend Librarian
+  end
+
+  class Dependency
+    class Requirement
+      def initialize(*args)
+        args = initialize_normalize_args(args)
+        self.backing = Gem::Requirement.create(puppet_to_gem_versions(args))
+      end
+
+      def puppet_to_gem_versions(args)
+        args.map do |arg|
+          case arg
+          when Array
+            arg.map { |v| Librarian::Puppet::Requirement.new(v).gem_requirement }
+          when String
+            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
+            arg.requirements.map{|x,y| "#{x}#{y}"}
+          end
+        end.flatten
+      end
+    end
+
+    alias :eql? :==
+
+    def hash
+      self.to_s.hash
+    end
+  end
+
+  # 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
+
+  class Manifest
+
+    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
+    class Version
+      @@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-]+)*))?$/
+      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
+
+      attr_reader :prerelease
+
+      def initialize(*args)
+        args = initialize_normalize_args(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 <=>(other)
+        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
+        @full_version
+      end
+    end
+  end
+
 end