librarian-puppet 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fc5dec8784fe45347e3f68e2664be05cbcf0a9b
-  data.tar.gz: aaa2dfce9b9b7060e0e3e0b4aa9ef99b4e33a766
+  metadata.gz: bc346f2177b53715db49807f07d06f48159669b5
+  data.tar.gz: 26ce629378954d0971ecb98232f826e6539e99e4
 SHA512:
-  metadata.gz: 23f0cd3a1f2a549be38aad58c3b3ebdf4d5e01471655d7318b1dce1ed10b5db1b4454fae8aae5b38c695144dae18018af4e472de97e1f0d1d5d603784587e2ec
-  data.tar.gz: 6fd3e484ad7b992afaf0d5c02bab4d3def309cbc667d20811f6323bf5a1161f3bcc756feb4577576ee1cbd26da17abcc912d1242bdde9081d461f4e2ca44b0ed
+  metadata.gz: 362ea152db680bd68ce4082ffbf39ba25132be50fb529a169ec7514779e66790ff92bec2c1e1d4c15752d9d4ee50cd35f88f62f26697b0c6ebb739574515089f
+  data.tar.gz: a14c13c99aeaab3f74b4ecadcece3654a37975fcf509808e6797c14aa8df07b18b3ff08b078a21000cfc44e70e237c328db796970e1c3072a167964d657f13df

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/
 Gemfile.lock
 tmp/
+coverage/

data/README.md

@@ -30,8 +30,8 @@ and isolate a project's dependencies.
 
 ## Versions
 
-Librarian-puppet >= 1.1.0 requires Ruby 1.9 and uses the Puppet Forge API v3.
-Versions < 1.1.0 works on Ruby 1.8.
+Librarian-puppet >= 2.0 (as well as 1.1, 1.2 and 1.3) requires Ruby 1.9 and uses the Puppet Forge API v3.
+Versions < 2.0 work on Ruby 1.8.
 
 See the [Changelog](Changelog.md) for more details.
 
@@ -55,7 +55,7 @@ as if the Puppetfile contained
 
 ### Example Puppetfile
 
-    forge "https://forge.puppetlabs.com"
+    forge "https://forgeapi.puppetlabs.com"
 
     mod 'puppetlabs-razor'
     mod 'puppetlabs-ntp', "0.0.3"
@@ -77,7 +77,7 @@ When fetching a module all dependencies specified in its
 
 ### Puppetfile Breakdown
 
-    forge "https://forge.puppetlabs.com"
+    forge "https://forgeapi.puppetlabs.com"
 
 This declares that we want to use the official Puppet Labs Forge as our default
 source when pulling down modules.  If you run your own local forge, you may
@@ -167,10 +167,10 @@ source specified.  This command writes the complete resolution into
 Librarian-puppet support both v1 and v3 of the Puppet Forge API.
 Specify a specific API version when installing modules:
 
-    $ librarian-puppet install --use-v1-api # this is default
-    $ librarian-puppet install --no-use-v1-api # use the v3 API
+    $ librarian-puppet install --use-v1-api # this is default; ignored for official Puppet Forge
+    $ librarian-puppet install --no-use-v1-api # use the v3 API; default for official Puppet Forge
 
-Please note that this does not apply for the official Puppet Forge where v3 is used by default.
+Please note that this does not apply for the official Puppet Forge, where v3 is used by default.
 
 Get an overview of your `Puppetfile.lock` with:
 
@@ -256,6 +256,28 @@ Configuration can be set by passing specific options to other commands.
   the environment or global config will be used.
 
 
+## Rsync Option
+
+The default convergence strategy between the cache and the module directory is
+to execute an `rm -r` on the module directory and just `cp -r` from the cache.
+This causes the module to be removed from the module path every time librarian
+puppet updates, regardless of whether the content has changed. This can cause
+some problems in environments with lots of change. The problem arises when the
+module directory gets removed while Puppet is trying to read files inside it.
+The `puppet master` process will lose its CWD and the catalog will fail to
+compile. To avoid this, you can use `rsync` to implement a more conservative
+convergence strategy. This will use `rsync` with the `-avz` and `--delete`
+flags instead of a `rm -r` and `cp -r`. To use this feature, just set the
+`rsync` configuration setting to `true`.
+
+    $ librarian-puppet config rsync true --global
+
+Alternatively, using an environment variable:
+
+    LIBRARIAN_PUPPET_RSYNC='true'
+
+Note that the directories will still be purged if you run librarian-puppet with
+the --clean or --destructive flags.
 
 ## How to Contribute
 

data/lib/librarian/puppet/dsl.rb

@@ -20,7 +20,7 @@ module Librarian
         if specfile.kind_of?(Pathname) and !File.exists?(specfile)
           debug { "Specfile not found, using defaults: #{specfile}" }
           specfile = Proc.new do
-            forge "https://forgeapi.puppetlabs.com"
+            forge "http://forge.puppetlabs.com"
             metadata
           end
         end

data/lib/librarian/puppet/extension.rb

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

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

@@ -1,7 +1,7 @@
 require 'uri'
 require 'librarian/puppet/util'
 require 'librarian/puppet/source/forge/repo_v1'
-require 'librarian/puppet/source/forge/repo_v3'
+# require 'librarian/puppet/source/forge/repo_v3'
 
 module Librarian
   module Puppet
@@ -53,10 +53,10 @@ module Librarian
         def initialize(environment, uri, options = {})
           self.environment = environment
 
-          if uri =~ %r{^http(s)?://forge\.puppetlabs\.com}
-            uri = "https://forgeapi.puppetlabs.com"
-            warn { "Replacing Puppet Forge API URL to use v3 #{uri}. You should update your Puppetfile" }
-          end
+          # if uri =~ %r{^http(s)?://forge\.puppetlabs\.com}
+          #   uri = "https://forgeapi.puppetlabs.com"
+          #   warn { "Replacing Puppet Forge API URL to use v3 #{uri}. You should update your Puppetfile" }
+          # end
 
           @uri = URI::parse(uri)
           @cache_path = nil
@@ -121,7 +121,7 @@ module Librarian
         end
 
         def install_path(name)
-          environment.install_path.join(organization_name(name))
+          environment.install_path.join(module_name(name))
         end
 
         def fetch_version(name, version_uri)
@@ -151,11 +151,11 @@ module Librarian
 
           unless @repo[name]
             # if we are using the official Forge then use API v3, otherwise stick to v1 for now
-            if uri.hostname =~ /\.puppetlabs\.com$/ || !environment.use_v1_api
-              @repo[name] = RepoV3.new(self, name)
-            else
+            # if uri.hostname =~ /\.puppetlabs\.com$/ || !environment.use_v1_api
+            #   @repo[name] = RepoV3.new(self, name)
+            # else
               @repo[name] = RepoV1.new(self, name)
-            end
+            # end
           end
           @repo[name]
         end

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

@@ -55,11 +55,11 @@ module Librarian
 
             cache_version_unpacked! version
 
-            if install_path.exist?
+            if install_path.exist? && rsync? != true
               install_path.rmtree
             end
 
-            unpacked_path = version_unpacked_cache_path(version).join(organization_name(name))
+            unpacked_path = version_unpacked_cache_path(version).join(module_name(name))
 
             unless unpacked_path.exist?
               raise Error, "#{unpacked_path} does not exist, something went wrong. Try removing it manually"

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

@@ -10,6 +10,11 @@ module Librarian
 
           PuppetForge.user_agent = "librarian-puppet/#{Librarian::Puppet::VERSION}"
 
+          def initialize(source, name)
+            PuppetForge.host = source.uri.clone
+            super(source, name)
+          end
+
           def get_versions
             get_module.releases.map{|r| r.version}
           end

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

@@ -98,7 +98,7 @@ module Librarian
         end
 
         def install_path(name)
-          environment.install_path.join(organization_name(name))
+          environment.install_path.join(module_name(name))
         end
 
         def fetch_version(name, version_uri)

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

@@ -48,7 +48,7 @@ module Librarian
 
             cache_version_unpacked! version
 
-            if install_path.exist?
+            if install_path.exist? && rsync? != true
               install_path.rmtree
             end
 

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

@@ -19,8 +19,8 @@ module Librarian
             warn { "Invalid module name '#{name}', you should qualify it with 'ORGANIZATION-#{name}' for resolution to work correctly" }
           end
 
-          install_path = environment.install_path.join(organization_name(name))
-          if install_path.exist?
+          install_path = environment.install_path.join(module_name(name))
+          if install_path.exist? && rsync? != true
             debug { "Deleting #{relative_path_to(install_path)}" }
             install_path.rmtree
           end
@@ -55,7 +55,7 @@ module Librarian
         end
 
         def forge_source
-          Forge.from_lock_options(environment, :remote => "https://forgeapi.puppetlabs.com")
+          Forge.from_lock_options(environment, :remote => "https://forge.puppetlabs.com")
         end
 
         private
@@ -103,24 +103,25 @@ module Librarian
         end
 
         def parsed_metadata
-          @metadata ||= if metadata?
-            JSON.parse(File.read(metadata))
-          elsif modulefile?
-            # translate Modulefile to metadata.json
-            evaluated = evaluate_modulefile(modulefile)
-            {
-              'version' => evaluated.version,
-              'dependencies' => evaluated.dependencies.map do |dependency|
-                {
-                  'name' => dependency.instance_variable_get(:@full_module_name),
-                  'version_requirement' => dependency.instance_variable_get(:@version_requirement)
-                }
-              end
-            }
-          else
-            {
-              'dependencies' => []
-            }
+          if @metadata.nil?
+            @metadata = if metadata?
+              JSON.parse(File.read(metadata))
+            elsif modulefile?
+              # translate Modulefile to metadata.json
+              evaluated = evaluate_modulefile(modulefile)
+              {
+                'version' => evaluated.version,
+                'dependencies' => evaluated.dependencies.map do |dependency|
+                  {
+                    'name' => dependency.instance_variable_get(:@full_module_name),
+                    'version_requirement' => dependency.instance_variable_get(:@version_requirement)
+                  }
+                end
+              }
+            else
+              {}
+            end
+            @metadata['dependencies'] ||= []
           end
           @metadata
         end

data/lib/librarian/puppet/templates/Puppetfile

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #^syntax detection
 
-forge "https://forgeapi.puppetlabs.com"
+forge "https://forge.puppetlabs.com"
 
 # use dependencies defined in metadata.json
 metadata

data/lib/librarian/puppet/util.rb

@@ -1,3 +1,5 @@
+require 'rsync'
+
 module Librarian
   module Puppet
 
@@ -13,16 +15,26 @@ module Librarian
         environment.logger.warn(*args, &block)
       end
 
+      def rsync?
+          environment.config_db.local['rsync'] == 'true'
+      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
+      #
+      # If the rsync configuration parameter is set, use rsync instead of FileUtils
       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)
+        if rsync?
+          Rsync.run(File.join(src, "/"), dest, ['-avz', '--delete'])
+        else
+          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
 
@@ -39,10 +51,14 @@ module Librarian
         name.sub('/','-')
       end
 
-      # get the organization name from organization-module
-      def organization_name(name)
-        name.split('-',2).last
+      # get the module name from organization-module
+      def module_name(name)
+        # module name can't have dashes, so let's assume it is everything after the last dash
+        name.rpartition('-').last
       end
+
+      # deprecated
+      alias :organization_name :module_name
     end
   end
 end

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "1.3.2"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Tim Sharpe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
@@ -26,7 +26,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: puppet_forge
+  name: rsync
+  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: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -137,6 +151,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: |-
   Simplify deployment of your Puppet infrastructure by
     automatically pulling in modules from the forge and git repositories with
@@ -188,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='