librarian-puppet-maestrodev 0.9.11.5 → 0.9.11.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDM5ZTU0ZTljMjZmY2M3MjljOTZjOTY5YzUzNDVhOWQ4ZGJhMDFkYw==
+    MzczNTBlYThiYjhiOGFhNDYwM2ZiNWVlYjJlN2U2ZTJhNDY5MGNiNg==
   data.tar.gz: !binary |-
-    Zjk3ZWQxNjhlMzg4MWFiYTlmYjMxOGQ1ZjYxMjg1YmU3ZmQ3ZDE5NA==
-SHA512:
+    OGU1NWI4OThmNmJjMjFjNDgwOGU2YzcxYWZkMmViOTFlNmViZjAyMQ==
+!binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmI4NDRmM2U2NWJhOTM5NzM4OTYzYmM4N2UxY2YwYTg4MWVhMmJlMWRlMzJi
-    NzhhODdkZWZiYTIxMjY5OGYwMDM1ZTI3ZjA5Nzc4NThmN2EwOGY1MzFlZjQ3
-    N2U1YmM1NzAxNDJkZjkzNzkwNzgyMjYyZWU1YzkwNDMyMWJmYTE=
+    Y2YyZDc4ZjBjYWFmZmY2MjBjMTE1ZmQ1NjBiYzZmN2FhNjMxMjY3ZWIyYzEx
+    ODNkOGE1M2EwODE2M2U1MmVmZTZjMmU3YzNlODU1N2UyOGVmNzUyN2JkMTgz
+    YWZhOGRkZTlhMjMyMzdjYjVkNWZlYTlhYTFiNDNkYTBhZDUyMzg=
   data.tar.gz: !binary |-
-    YTU1NmQ1NTMyYWE5M2U4YTJkODkxMmMzZDNmZWQ5ZjZlYmFkNjg3MGFmZWNl
-    NGNmYzlmY2JiNGQ5Y2VkOGNjZmFlMzYzZjdkYjY4YjEyZTY4MGUzMDNkOGQ0
-    Y2NkOTJjZTIxMDY2YTQ5ZWEzYTFkNzZkZDg0YTMyNjJjYTZiMDc=
+    MGE1NjVlYjI3MDcxNTQyM2JhODczZDc3ODAzMzg0ZjA5ZjkxYWZlNjNmMTE0
+    ZTA4MWNjZDRiODhhN2ZhOWI1OTk0NTBhNWNhNTQ1ODI1ODg3YTI1MzE1Yzgy
+    YzNhYTllNzk0MTM3NWIwMDM4OTFjZWFkM2UxNDcyYzZiODgwOTQ=

data/README.md

@@ -4,8 +4,9 @@
 
 ## Note
 
-This is a fork of [rodjek librarian-puppet](https://github.com/rodjek/librarian-puppet) to publish to rubygems
-[librarian-puppet-maestrodev](https://rubygems.org/gems/librarian-puppet-maestrodev)
+**Since 0.9.11.6 this fork is no longer used, as I am committing directly to [rodjek's librarian-puppet](https://github.com/rodjek/librarian-puppet) and pushing to [librarian-puppet](https://rubygems.org/gems/librarian-puppet)**
+
+**librarian-puppet-maestrodev 0.9.11.6 is effectively the same as librarian-puppet 0.9.11**
 
 ## Introduction
 

data/lib/librarian/puppet/cli.rb

@@ -7,6 +7,11 @@ module Librarian
   module Puppet
     class Cli < Librarian::Cli
 
+      def initialize(*)
+        super
+        say "librarian-puppet-maestrodev gem is now deprecated in favor of librarian-puppet 0.9.11 and is no longer updated"
+      end
+
       module Particularity
         def root_module
           Puppet
@@ -67,6 +72,7 @@ module Librarian
         environment.config_db.local['mode'] = options['local'] ? 'local' : nil
 
         resolve!
+        debug { "Install: dependencies resolved"}
         install!
       end
 

data/lib/librarian/puppet/source.rb

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

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

@@ -5,7 +5,10 @@ module Librarian
   module Puppet
     module Source
       class Forge
+        include Librarian::Puppet::Util
+
         class Repo
+          include Librarian::Puppet::Util
 
           attr_accessor :source, :name
           private :source=, :name=
@@ -13,12 +16,17 @@ module Librarian
           def initialize(source, name)
             self.source = source
             self.name = name
+            # API returned data for this module including all versions and dependencies, indexed by module name
+            # from http://forge.puppetlabs.com/api/v1/releases.json?module=#{name}
             @api_data = nil
+            # API returned data for this module and a specific version, indexed by version
+            # from http://forge.puppetlabs.com/api/v1/releases.json?module=#{name}&version=#{version}
+            @api_version_data = {}
           end
 
           def versions
             return @versions if @versions
-            @versions = api_data[name].map { |r| r['version'] }.reverse
+            @versions = api_data(name).map { |r| r['version'] }.reverse
             if @versions.empty?
               info { "No versions found for module #{name}" }
             else
@@ -28,7 +36,7 @@ module Librarian
           end
 
           def dependencies(version)
-            api_data[name].detect{|x| x['version'] == version.to_s}['dependencies']
+            api_version_data(name, version)['dependencies']
           end
 
           def manifests
@@ -57,7 +65,7 @@ module Librarian
             unless unpacked_path.exist?
               raise Error, "#{unpacked_path} does not exist, something went wrong. Try removing it manually"
             else
-              FileUtils.cp_r(unpacked_path, install_path)
+              cp_r(unpacked_path, install_path)
             end
 
           end
@@ -127,41 +135,48 @@ module Librarian
           end
 
           def vendor_cache(name, version)
-            info = api_data[name].detect {|h| h['version'] == version.to_s }
-            File.open(vendored_path(name, version).to_s, 'w') do |f|
-              open("#{source}#{info['file']}") do |input|
-                while (buffer = input.read)
-                  f.write(buffer)
-                end
+            info = api_version_data(name, version)
+            url = "#{source}#{info[name].first['file']}"
+            path = vendored_path(name, version).to_s
+            debug { "Downloading #{url} into #{path}"}
+            File.open(path, 'wb') do |f|
+              open(url, "rb") do |input|
+                f.write(input.read)
               end
             end
           end
 
-          def debug(*args, &block)
-            environment.logger.debug(*args, &block)
-          end
-          def info(*args, &block)
-            environment.logger.info(*args, &block)
-          end
-
         private
-          def api_data
-            return @api_data if @api_data
+
+          # get and cache the API data for a specific module with all its versions and dependencies
+          def api_data(module_name)
+            return @api_data[module_name] if @api_data
             # call API and cache data
-            @api_data = api_call(name)
+            @api_data = api_call(module_name)
             if @api_data.nil?
               raise Error, "Unable to find module '#{name}' on #{source}"
             end
-            @api_data
+            @api_data[module_name]
+          end
+
+          # get and cache the API data for a specific module and version
+          def api_version_data(module_name, version)
+            # if we already got all the versions, find in cached data
+            return @api_data[module_name].detect{|x| x['version'] == version.to_s} if @api_data
+            # otherwise call the api for this version if not cached already
+            @api_version_data[version] = api_call(name, version) if @api_version_data[version].nil?
+            @api_version_data[version]
           end
 
-          def api_call(module_name)
-            debug { "Querying Forge API for module #{name}" }
+          def api_call(module_name, version=nil)
             base_url = source.uri
-            path     = "api/v1/releases.json?module=#{module_name}"
+            path = "api/v1/releases.json?module=#{module_name}"
+            path = "#{path}&version=#{version}" unless version.nil?
+            url = "#{base_url}/#{path}"
+            debug { "Querying Forge API for module #{name}#{" and version #{version}" unless version.nil?}: #{url}" }
             
             begin
-              data = open("#{base_url}/#{path}") {|f| f.read}
+              data = open(url) {|f| f.read}
               JSON.parse(data)
             rescue OpenURI::HTTPError => e
               case e.io.status[0].to_i

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

@@ -23,6 +23,7 @@ module Librarian
     module Source
       class Git < Librarian::Source::Git
         include Local
+        include Librarian::Puppet::Util
 
         def cache!
           return vendor_checkout! if vendor_cached?

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

@@ -9,7 +9,11 @@ module Librarian
   module Puppet
     module Source
       class GitHubTarball
+        include Librarian::Puppet::Util
+
         class Repo
+          include Librarian::Puppet::Util
+
           TOKEN_KEY = 'GITHUB_API_TOKEN'
 
           attr_accessor :source, :name
@@ -55,7 +59,7 @@ module Librarian
             end
 
             unpacked_path = version_unpacked_cache_path(version).children.first
-            FileUtils.cp_r(unpacked_path, install_path)
+            cp_r(unpacked_path, install_path)
           end
 
           def environment
@@ -121,10 +125,6 @@ module Librarian
             end
           end
 
-          def debug(*args, &block)
-            environment.logger.debug(*args, &block)
-          end
-
         private
 
           def api_call(path)

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

@@ -2,6 +2,7 @@ module Librarian
   module Puppet
     module Source
       module Local
+        include Librarian::Puppet::Util
 
         def install!(manifest)
           manifest.source == self or raise ArgumentError
@@ -41,7 +42,7 @@ module Librarian
 
         def install_perform_step_copy!(found_path, install_path)
           debug { "Copying #{relative_path_to(found_path)} to #{relative_path_to(install_path)}" }
-          FileUtils.cp_r(found_path, install_path, :preserve => true)
+          cp_r(found_path, install_path)
         end
 
         def manifest?(name, path)

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.11.5"
+    VERSION = "0.9.11.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet-maestrodev
 version: !ruby/object:Gem::Version
-  version: 0.9.11.5
+  version: 0.9.11.6
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
@@ -122,10 +122,10 @@ dependencies:
     - - ! '>='
       - !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."
+description: librarian-puppet-maestrodev gem is now deprecated in favor of librarian-puppet
+  0.9.11 and is no longer updated
 email:
-- tim@sharpe.id.au
+- support@maestrodev.com
 executables:
 - librarian-puppet
 extensions: []
@@ -136,21 +136,22 @@ files:
 - README.md
 - bin/librarian-puppet
 - lib/librarian/puppet.rb
-- lib/librarian/puppet/cli.rb
 - lib/librarian/puppet/dsl.rb
-- lib/librarian/puppet/environment.rb
-- lib/librarian/puppet/extension.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/source.rb
+- lib/librarian/puppet/version.rb
+- lib/librarian/puppet/templates/Puppetfile
+- lib/librarian/puppet/extension.rb
+- lib/librarian/puppet/util.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/templates/Puppetfile
-- lib/librarian/puppet/version.rb
-homepage: https://github.com/rodjek/librarian-puppet
+- lib/librarian/puppet/source/local.rb
+homepage: https://github.com/maestrodev/librarian-puppet
 licenses:
 - MIT
 metadata: {}
@@ -170,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Bundler for your Puppet modules