librarian-puppet 0.9.1 → 0.9.2.pre

data/lib/librarian/puppet.rb

@@ -1,7 +1,12 @@
+require 'librarian'
+require 'puppet'
+
 require 'librarian/puppet/extension'
+require 'librarian/puppet/version'
+
+require 'librarian/action/install'
 
 module Librarian
   module Puppet
-    VERSION = "0.9.1"
   end
 end

data/lib/librarian/puppet/cli.rb

@@ -35,6 +35,27 @@ module Librarian
         end
       end
 
+      desc "install", "Resolves and installs all of the dependencies you specify."
+      option "quiet", :type => :boolean, :default => false
+      option "verbose", :type => :boolean, :default => false
+      option "line-numbers", :type => :boolean, :default => false
+      option "clean", :type => :boolean, :default => false
+      option "strip-dot-git", :type => :boolean
+      option "path", :type => :string
+      def install
+        ensure!
+        clean! if options["clean"]
+        if options.include?("strip-dot-git")
+          strip_dot_git_val = options["strip-dot-git"] ? "1" : nil
+          environment.config_db.local["install.strip-dot-git"] = strip_dot_git_val
+        end
+        if options.include?("path")
+          environment.config_db.local["path"] = options["path"]
+        end
+        resolve!
+        install!
+      end
+
       def version
         say "librarian-puppet v#{Librarian::Puppet::VERSION}"
       end

data/lib/librarian/puppet/environment.rb

@@ -1,6 +1,7 @@
 require "librarian/environment"
 require "librarian/puppet/dsl"
 require "librarian/puppet/source"
+require "librarian/puppet/lockfile/parser"
 
 module Librarian
   module Puppet

data/lib/librarian/puppet/lockfile/parser.rb

@@ -0,0 +1,53 @@
+require 'librarian/manifest'
+require 'librarian/dependency'
+require 'librarian/manifest_set'
+
+module Librarian
+  class Lockfile
+    class Parser
+
+      def parse(string)
+        string = string.dup
+        source_type_names_map = Hash[dsl_class.source_types.map{|t| [t[1].lock_name, t[1]]}]
+        source_type_names = dsl_class.source_types.map{|t| t[1].lock_name}
+        lines = string.split(/(\r|\n|\r\n)+/).select{|l| l =~ /\S/}
+        sources = []
+        while source_type_names.include?(lines.first)
+          source = {}
+          source_type_name = lines.shift
+          source[:type] = source_type_names_map[source_type_name]
+          options = {}
+          while lines.first =~ /^ {2}([\w\-\/]+):\s+(.+)$/
+            lines.shift
+            options[$1.to_sym] = $2
+          end
+          source[:options] = options
+          lines.shift # specs
+          manifests = {}
+          while lines.first =~ /^ {4}([\w\-\/]+) \((.*)\)$/ # This change allows forward slash
+            lines.shift
+            name = $1
+            manifests[name] = {:version => $2, :dependencies => {}}
+            while lines.first =~ /^ {6}([\w\-\/]+) \((.*)\)$/
+              lines.shift
+              manifests[name][:dependencies][$1] = $2.split(/,\s*/)
+            end
+          end
+          source[:manifests] = manifests
+          sources << source
+        end
+        manifests = compile(sources)
+        manifests_index = Hash[manifests.map{|m| [m.name, m]}]
+        raise StandardError, "Expected DEPENDENCIES topic!" unless lines.shift == "DEPENDENCIES"
+        dependencies = []
+        while lines.first =~ /^ {2}([\w\-\/]+)(?: \((.*)\))?$/ # This change allows forward slash
+          lines.shift
+          name, requirement = $1, $2.split(/,\s*/)
+          dependencies << Dependency.new(name, requirement, manifests_index[name].source)
+        end
+        Resolution.new(dependencies, manifests)
+      end
+
+    end
+  end
+end

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

@@ -1,16 +1,13 @@
 require 'uri'
 require 'net/http'
 require 'json'
-require 'librarian/helpers/debug'
 
 module Librarian
   module Puppet
     module Source
       class Forge
-        include Helpers::Debug
         class Repo
 
-          include Helpers::Debug
           attr_accessor :source, :name
           private :source=, :name=
 
@@ -43,12 +40,10 @@ module Librarian
             cache_version_unpacked! version
 
             if install_path.exist?
-              debug { "Deleting #{relative_path_to(install_path)}" }
               install_path.rmtree
             end
 
             unpacked_path = version_unpacked_cache_path(version).join(name.split('/').last)
-            debug { "Copying #{relative_path_to(unpacked_path)} to #{relative_path_to(install_path)}" }
             FileUtils.cp_r(unpacked_path, install_path)
           end
 
@@ -75,7 +70,6 @@ module Librarian
             path.mkpath
 
             output = `puppet module install -i #{path.to_s} --modulepath #{path.to_s} --ignore-dependencies #{name} 2>&1`
-            debug { output }
           end
 
         private
@@ -157,8 +151,6 @@ module Librarian
           install_path = install_path(name)
           repo = repo(name)
 
-          debug { "Installing #{manifest}" }
-
           repo.install_version! version, install_path
         end
 

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

@@ -14,6 +14,28 @@ module Librarian
           command = %W(rev-parse #{reference}^{commit} --quiet)
           run!(command, :chdir => true).strip
         end
+
+        def dependencies
+          return {} unless modulefile?
+
+          metadata = ::Puppet::ModuleTool::Metadata.new
+
+          ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
+
+          metadata.dependencies.inject({}) do |h, dependency|
+            name = dependency.instance_variable_get(:@full_module_name)
+            version = dependency.instance_variable_get(:@version_requirement)
+            h.update(name => version)
+          end
+        end
+
+        def modulefile
+          File.join(path, 'Modulefile')
+        end
+
+        def modulefile?
+          File.exists?(modulefile)
+        end
       end
     end
   end
@@ -22,6 +44,13 @@ module Librarian
     module Source
       class Git < Librarian::Source::Git
         include Local
+
+        def fetch_dependencies(name, version, extra)
+          repository.dependencies.map do |k, v|
+            Dependency.new(k, v, nil)
+          end
+        end
+
       end
     end
   end

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

@@ -46,6 +46,7 @@ module Librarian
         def manifest?(name, path)
           return true if path.join('manifests').exist?
           return true if path.join('lib').join('puppet').exist?
+          return true if path.join('lib').join('facter').exist?
           false
         end
       end

data/lib/librarian/puppet/version.rb

@@ -0,0 +1,5 @@
+module Librarian
+  module Puppet
+    VERSION = "0.9.2.pre"
+  end
+end

data/vendor/librarian/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## 0.0.24
+
+* \#15. A remembered configuration system.
+
+* \#16. Configure, and remember configuration for, chef install paths.
+
+* \#38. Configure, and remember configuration for, stripping out `.git`
+  directories from git-sources chef dependencies.
+
+* \#76. Support git annotated tags.
+
+* \#80. Ignore directories in the `PATH` named `git` when looking for the `git`
+  bin.
+
+* \#85. Provide a helpful message when running the `show` command without a
+  lockfile present.
+
 ## 0.0.23
 
 * \#41. Build gems with a built gemspec.

data/vendor/librarian/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in librarian.gemspec
 gemspec
+
+gem "fakefs", :require => "fakefs/safe"

data/vendor/librarian/README.md

@@ -12,33 +12,49 @@ A bundler written with Librarian will expect you to provide a specfile listing
 your project's declared dependencies, including any version constraints and
 including the upstream sources for finding them. Librarian can resolve the spec,
 write a lockfile listing the full resolution, fetch the resolved dependencies,
-install them, and isolate them in your project. This is what Bundler does for
-projects that depend on Ruby gems.
+install them, and isolate them in your project.
+
+A bundler written with Librarian will be similar in kind to [Bundler](http://gembundler.com),
+the bundler for Ruby gems that many modern Rails applications use.
 
 Librarian-Chef
 ---------------
 
+Librarian-Chef is a tool that helps you manage the cookbooks that your chef-repo
+depends on. Here are some more details.
+
 Librarian-Chef is a bundler for infrastructure repositories using Chef. You can
-use Librarian-Chef to resolve your infrastructure's cookbook dependencies,
-fetch them and install them into your infrastructure.
+use Librarian-Chef to resolve your infrastructure's cookbook dependencies, fetch
+them, and install them into your infrastructure repository.
+
+Librarian-Chef can resolve and fetch third-party, publicly-released cookbooks,
+and install them into your infrastructure repository. It can also source
+cookbooks directly from their own source control repositories.
+
+Librarian-Chef can also deal with cookbooks you may actively be working on
+outside your infrastructure repository. For example, it can deal with cookbooks
+directly from their own private source control repositories, whether they are
+remote or local to your machine, and it can deal with cookbooks released to and
+hosted on a private cookbooks server.
 
-Librarian-Chef is for resolving and fetching third-party, publicly-released
-cookbooks, and installing them into your infrastructure repository. It is not
-for dealing with the cookbooks you're actively working on within your
-infrastructure repository.
+Librarian-Chef is not primarily intended for dealing with the cookbooks you are
+actively working on *within* your infrastructure repository. In such a case, you
+can still use Librarian-Chef, but it is likely unnecessary.
 
 Librarian-Chef *takes over* your `cookbooks/` directory and manages it for you
 based on your `Cheffile`. Your `Cheffile` becomes the authoritative source for
 the cookbooks your infrastructure repository depends on. You should not modify
 the contents of your `cookbooks/` directory when using Librarian-Chef. If you
-have custom cookbooks which are specific to your infrastructure repository,
-they should go in your `site-cookbooks/` directory.
+have cookbooks which are, rather than being separate projects, inherently part
+of your infrastructure repository, then they should go in a separate directory,
+like your `site-cookbooks/` directory, and you do not need to use Librarian-Chef
+to manage them.
 
 ### The Cheffile
 
 Every infrastruture repository that uses Librarian-Chef will have a file named
 `Cheffile` in the root directory of that repository. The full specification for
-which third-party, publicly-rleased cookbooks your infrastructure repository
+which third-party, publicly-released cookbooks your infrastructure repository
 depends will go here.
 
 Here's an example `Cheffile`:
@@ -103,7 +119,7 @@ most recent version of the cookbook from that same branch.
 
 The Git source also supports a `:path =>` option. If we use the path option,
 Librarian-Chef will navigate down into the Git repository and only use the
-specified subdirectory. Many people have the havit of having a single repository
+specified subdirectory. Many people have the habit of having a single repository
 with many cookbooks in it. If we need a cookbook from such a repository, we can
 use the `:path =>` option here to help Librarian-Chef drill down and find the
 cookbook subdirectory.
@@ -130,8 +146,8 @@ Prepare your infrastructure repository:
 
     $ cd ~/path/to/chef-repo
     $ git rm -r cookbooks
-    $ echo cookbooks >> .gitignore
-    $ echo tmp >> .gitignore
+    $ echo /cookbooks >> .gitignore
+    $ echo /tmp >> .gitignore
 
 Librarian-Chef takes over your `cookbooks/` directory, and will always reinstall
 the cookbooks listed the `Cheffile.lock` into your `cookbooks/` directory. Hence
@@ -240,6 +256,75 @@ Upload the cookbooks to your chef-server:
 
     $ knife cookbook upload --all
 
+### Configuration
+
+Configuration comes from three sources with the following highest-to-lowest
+precedence:
+
+* The local config (`./.librarian/chef/config`)
+* The environment
+* The global config (`~/.librarian/chef/config`)
+
+You can inspect the final configuration with:
+
+    $ librarian-chef config
+
+You can find out where a particular key is set with:
+
+    $ librarian-chef config KEY
+
+You can set a key at the global level with:
+
+    $ librarian-chef config KEY VALUE --global
+
+And remove it with:
+
+    $ librarian-chef config KEY --global --delete
+
+You can set a key at the local level with:
+
+    $ librarian-chef config KEY VALUE --local
+
+And remove it with:
+
+    $ librarian-chef 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-chef`. Configurations set at the environment level are
+not saved and will not affect subsequent invocations of `librarian-chef`.
+
+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_CHEF_`. For example, to pass a config in the environment for the key
+`part-one.part-two`, set the environment variable
+`LIBRARIAN_CHEF_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 `Cheffile`. The
+  equivalent environment variable is `LIBRARIAN_CHEF_PATH`.
+
+* The `install.strip-dot-git` config causes the `.git/` directory to be stripped
+  out when installing cookbooks from a git source. This must be set to exactly
+  "1" to cause this behavior. The equivalent environment variable is
+  `LIBRARIAN_CHEF_INSTALL__STRIP_DOT_GIT`.
+
+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.
+
+* The `install.strip-dot-git` config can be set at the local level by passing
+  the `--strip-dot-git` option to the `install` command. It can be unset at the
+  local level by passing the `--no-strip-dot-git` option.
+
 ### Knife Integration
 
 You can integrate your `knife.rb` with Librarian-Chef.

data/vendor/librarian/features/chef/cli/init.feature

@@ -4,6 +4,7 @@ Feature: cli/init
 
   Scenario: Initing a directory
     When I run `librarian-chef init`
+    Then the exit status should be 0
     Then a file named "Cheffile" should exist
 
 

data/vendor/librarian/features/chef/cli/show.feature

@@ -21,7 +21,19 @@ Feature: cli/show
       path 'cookbook-sources'
       cookbook 'main'
       """
-    Given I run `librarian-chef install`
+    Given I run `librarian-chef install --quiet`
+
+
+
+  Scenario: Showing al without a lockfile
+    Given I remove the file "Cheffile.lock"
+    When  I run `librarian-chef show`
+    Then  the exit status should be 1
+    Then  the output should contain exactly:
+      """
+      Be sure to install first!
+
+      """
 
 
 

data/vendor/librarian/lib/librarian/action/base.rb

@@ -1,11 +1,7 @@
-require "librarian/helpers/debug"
-
 module Librarian
   module Action
     class Base
 
-      include Helpers::Debug
-
       attr_accessor :environment
       private :environment=
 
@@ -17,6 +13,12 @@ module Librarian
         self.options = options
       end
 
+    private
+
+      def debug(*args, &block)
+        environment.logger.debug(*args, &block)
+      end
+
     end
   end
 end