librarian-puppet 0.9.10 → 0.9.11

data/lib/librarian/puppet/templates/Puppetfile

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby
+#^syntax detection
+
 forge "http://forge.puppetlabs.com"
 
 # mod 'puppetlabs/stdlib'

data/lib/librarian/puppet/util.rb

@@ -0,0 +1,27 @@
+module Librarian
+  module Puppet
+
+    module Util
+
+      def debug(*args, &block)
+        environment.logger.debug(*args, &block)
+      end
+      def info(*args, &block)
+        environment.logger.info(*args, &block)
+      end
+
+      # workaround Issue #173 FileUtils.cp_r will fail if there is a symlink that points to a missing file
+      # or when the symlink is copied before the target file when preserve is true
+      # see also https://tickets.opscode.com/browse/CHEF-833
+      def cp_r(src, dest)
+        begin
+          FileUtils.cp_r(src, dest, :preserve => true)
+        rescue Errno::ENOENT
+          debug { "Failed to copy from #{src} to #{dest} preserving file types, trying again without preserving them" }
+          FileUtils.rm_rf(dest)
+          FileUtils.cp_r(src, dest)
+        end
+      end
+    end
+  end
+end

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "0.9.10"
+    VERSION = "0.9.11"
   end
 end

metadata

@@ -1,121 +1,116 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: librarian-puppet
-version: !ruby/object:Gem::Version
-  version: 0.9.10
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 0.9.11
 platform: ruby
-authors:
+authors: 
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.15'
-  type: :runtime
+
+date: 2014-02-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: librarian
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.15'
-- !ruby/object:Gem::Dependency
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.1
+  version_requirements: *id001
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id003 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  version_requirements: *id002
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  name: open3_backport
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id003
+  version_requirements: *id004
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id003
+  version_requirements: *id005
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id003
+  version_requirements: *id006
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: cucumber
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id003
+  version_requirements: *id007
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: aruba
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id003
+  version_requirements: *id008
+  type: :development
+- !ruby/object:Gem::Dependency 
   name: puppet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id003
+  version_requirements: *id009
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: minitest
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! "Simplify deployment of your Puppet infrastructure by\n  automatically
-  pulling in modules from the forge and git repositories with\n  a single command."
-email:
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "5"
+  version_requirements: *id010
+  type: :development
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id003
+  version_requirements: *id011
+  type: :development
+description: |-
+  Simplify deployment of your Puppet infrastructure by
+    automatically pulling in modules from the forge and git repositories with
+    a single command.
+email: 
 - tim@sharpe.id.au
-executables:
+executables: 
 - librarian-puppet
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - LICENSE
 - README.md
@@ -133,127 +128,31 @@ files:
 - lib/librarian/puppet/source/path.rb
 - lib/librarian/puppet/source.rb
 - lib/librarian/puppet/templates/Puppetfile
+- lib/librarian/puppet/util.rb
 - 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/manifest_version_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
 homepage: https://github.com/rodjek/librarian-puppet
-licenses: []
+licenses: 
+- MIT
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id003
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id003
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Bundler for your Puppet modules
 test_files: []
+

data/vendor/librarian/CHANGELOG.md

@@ -1,185 +0,0 @@
-# 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.
-
-* \#67. Cache remote objects at the latest possible moments, and only when they
-  are needed.
-
-* \#68. Fix unpacking chef site-sourced packages on Windows by pivoting from a
-  Librarian-managed scratch space, rather than pivoting from Windows' temp
-  directory. There were unexplained problems with using the Windows temp
-  directory in certain cases, possibly related to the temp directory and the
-  Librarian cache directory being on different volumes.
-
-* \#69. Fix invoking Librarian with git-sourced dependencies from git hooks by
-  unsetting `GIT_DIR` around shelling out to git.
-
-* Print general environment information when running with `--verbose`.
-
-## 0.0.22
-
-* Fix the `outdated` CLI command.
-
-## 0.0.21
-
-* \#64. Sources now raise when given unrecognized options in the specfile.
-
-* A new `show` CLI command.
-
-* Changed the `clean` CLI command no longer to delete the lockfile.
-
-* Simplify the architecture of `Librarian::Manifest` vis-a-vis sources. It is no
-  longer a base class for adapters to inherit. Now, sources expose a small
-  interface, which `Librarian::Manifest` can call, for delay-loading attributes.
-
-* The git source now resolves the `git` binary before `chdir`ing.
-
-* Test on Rubinius.
-
-## 0.0.20
-
-* A command to print outdated dependencies.
-
-## 0.0.19
-
-* Fix breakage on 1.8.
-
-## 0.0.18
-
-* \#57. Include existing manifests' dependencies in resolution.
-
-* Permit the update action even with a changed specfile.
-
-## 0.0.17
-
-* Use a pure-Ruby implementation of tar/gz. Helps with Windows support, since
-  Windows boxes are less likely than *NIX boxes to have the `tar` executable.
-
-* Fix an issue where the chef site source considers uncached manifests to be
-  cached, and skips caching them, causing the install action to fail.
-
-* Fail fast if the resolver produces an inconsistent resolution. It is a known
-  issue that the resolver will sometimes (deterministically, not randomly)
-  produce an inconsistent resolution when performing an update action (#57).
-  Start debugging this by failing fast at this point and spitting out gobs of
-  debug-level log details.
-
-## 0.0.16
-
-* Recache site-sourced dependency metadata per each run.
-
-* \#46. Always install.
-
-* \#53. Abstract versions & requirements from rubygems.
-
-* Own the install path. Recreate it on each install.
-    WARNING: If you have your own content in the install path, it will be deleted without mercy.
-
-## 0.0.15
-
-* Rewrite the README.
-
-* \#44, \#49. Better updating of cached git sources without using local merges.
-
-## 0.0.14
-
-* \#39 Fixes a regression induced by using `git reset --hard SHA`.
-
-## 0.0.13
-
-* \#36 Fixes an issue where, if a dependency has a git source (the upstream), and the upstream is updated,
-    then attempting to update that dependency in the local resolution would not update that dependency so
-    long as that git source were cached (@databus23).
-
-* More immediate detection of, and better error messages for, cases of blank dependency or manifest names
-    or cases of names that are otherwise insensible, such as names that are untrimmed.
-
-## 0.0.12
-
-* Fixes an issue where, if a dependency has a git source with a ref, re-resolving may fail.
-
-## 0.0.11
-
-* Fix a regression where the cli command "version" failed.
-
-## 0.0.10
-
-This release focuses on refactoring some of the internals. There are no functional changes.
-
-## 0.0.9
-
-* \#11 Fixes a problem where, if the repo is in a path where a component has a space, attempting to resolve a
-    site-sourced dependency fails.
-
-## 0.0.8
-
-* A `version` task.
-
-* A change log.
-
-* \#10 Fixes the problem with bouncing the lockfile when updating, when using a git source with the default ref.
-
-## 0.0.7
-
-* \#8 Add highline temporarily as a runtime dependency of `librarian` (@fnichol).
-  When the project is split into `librarian` and `librarian-chef`, the `chef` runtime dependency will
-    be moved to `librarian-chef`. If the project is further split into a knife plugin, the dependency
-    will be moved there.
-
-## 0.0.6
-
-* \#7 Show a better error message when a cookbook is missing the required metadata file.
-
-* Miscellaneous bugfixes.
-
-## 0.0.5
-
-* \#4 An `init` task for `librarian-chef`.
-  This task creates a nearly-blank `Cheffile` with just the default Opscode Community Site source.
-
-* Automatically create the `cookbooks` directory, if it's missing, when running the `install` task.
-
-* \#3 Add `chef` temporarily as a runtime dependency of `librarian` (@fnichol).
-  When the project is split into `librarian` and `librarian-chef`, the `chef` runtime dependency will
-    be moved to `librarian-chef`.
-
-## 0.0.4
-
-* A simple knife integration.
-  This integration allows you to specify a `librarian-chef`-managed tempdir as a `cookbook_path`.
-  This is useful to force knife only to upload the exact cookbooks that `librarian-chef` knows
-    about, rather than whatever happens to be found in the `cookbooks` directory.
-
-## 0.0.3
-
-* Miscellaneous bugfixes.
-
-## 0.0.2
-
-* An optional `:path` attribute for `:git` sources.
-  This allows you to specify exactly where within a git repository a given cookbook is to be found.
-
-* A full example of a Cheffile and its usage in the readme.
-
-## 0.0.1
-
-* Initial release.