librarian-puppet 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjU3NTQyOTU1MGVhOGM2YTllMWFkZjMyNTExNTQ4YmZjOTcyYzNhYQ==
-  data.tar.gz: !binary |-
-    ZmExNmU0MmZmYmMxMTkyNzY2ZTRiNjA1ODNkMWY4NGE3NWVhNjk2OQ==
+SHA1:
+  metadata.gz: 1984f0b83258ba54c8f1d62a2d6804dd29d75065
+  data.tar.gz: e64114a525b0f92e74d4d09277b9f0dd5f76e0c6
 SHA512:
-  metadata.gz: !binary |-
-    YTljOThjZDE3MDhiYWU5M2U1M2M1MTRiNjk2ZDFlYzcyYWZlM2ZmZmUwNDA3
-    MTMxZDIzMWNlMjUxNjM2ZDRiNWM0MTRjZjljMDViZjZhMDMyNTI0MGE4YTYy
-    MTNkZjBkOWFjMzA2ZjBmZmY0Yjk0OGZlY2RkMjk5OTcwY2QzYjE=
-  data.tar.gz: !binary |-
-    MTI3ZGVhM2ZhYjg2ZjYyMDI4OTM1OTQ1ODc5NjBhNDYzODhjNjRiYzBhNjU3
-    NGNlOTQ5N2RiYmYzZGJiNGRmMmY5MTg5YTEyODVjMTAzMTFmZTMyY2E1ZTNh
-    YjRjYzVlOTZhMGUxMzhmMmQwOGNhMWJlYTVjM2ZiNGM5MmVmMjI=
+  metadata.gz: c5a3794a4677ae67769338e469d2eb9c646b1497cdf4b6ef6ad81a11e525350e0e397f7bf8d9a81202e33aa24c311aa6e81f3d400e1eb1729725287aceafd289
+  data.tar.gz: afb5509325ef53d0d24334c9ddb3c2607ba35823024a96f1ce285b2306002ea0ba46fcb7a59cb937512c047b131ccd0813c71b0c4966f80819d762f7480e6f8c

data/README.md

@@ -250,7 +250,7 @@ Bug reports to the github issue tracker please.
 Please include:
 
  * Relevant `Puppetfile` and `Puppetfile.lock` files
- * Version of ruby, librarian-puppet
+ * Version of ruby, librarian-puppet, and puppet
  * What distro
  * 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.

data/lib/librarian/puppet.rb

@@ -1,21 +1,6 @@
 require 'librarian'
 require 'fileutils'
 
-out = nil
-begin
-  out = Librarian::Posix.run!(%W{puppet --version})
-rescue Librarian::Posix::CommandFailure => error
-
-  $stderr.puts <<-EOF
-Unable to load puppet. Please install it using native packages for your platform (eg .deb, .rpm, .dmg, etc).
-puppet --version returned #{status.exitstatus}
-#{error.message unless error.message.nil?}
-EOF
-  exit 1
-end
-
-PUPPET_VERSION=out.split(' ').first.strip
-
 require 'librarian/puppet/extension'
 require 'librarian/puppet/version'
 
@@ -23,5 +8,29 @@ require 'librarian/action/install'
 
 module Librarian
   module Puppet
+    @@puppet_version = nil
+
+    # Output of puppet --version, typically x.y.z
+    # For Puppet Enterprise it contains the PE version too, ie. 3.4.3 (Puppet Enterprise 3.2.1)
+    def puppet_version
+      return @@puppet_version unless @@puppet_version.nil?
+
+      begin
+        @@puppet_version = Librarian::Posix.run!(%W{puppet --version})
+      rescue Librarian::Posix::CommandFailure => error
+        msg = "Unable to load puppet. Please install it using native packages for your platform (eg .deb, .rpm, .dmg, etc)."
+        msg += "\npuppet --version returned #{error.status}"
+        msg += "\n#{error.message}" unless error.message.nil?
+        $stderr.puts msg
+        exit 1
+      end
+      return @@puppet_version
+    end
+
+    # Puppet version x.y.z translated as a Gem version
+    def puppet_gem_version
+      Gem::Version.create(puppet_version.split(' ').first.strip.gsub('-', '.'))
+    end
+
   end
 end

data/lib/librarian/puppet/source.rb

@@ -1,4 +1,3 @@
-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

@@ -1,5 +1,6 @@
 require 'json'
 require 'open-uri'
+require 'librarian/puppet/util'
 
 module Librarian
   module Puppet
@@ -103,9 +104,15 @@ module Librarian
 
             target = vendored?(name, version) ? vendored_path(name, version).to_s : name
 
+            # TODO can't pass the default forge url (http://forge.puppetlabs.com) to clients that use the v3 API (https://forgeapi.puppetlabs.com)
+            module_repository = source.to_s
+            if Forge.client_api_version() > 1 and source =~ %r{^http(s)?://forge\.puppetlabs\.com}
+              module_repository = "https://forgeapi.puppetlabs.com"
+              warn("Your Puppet client uses the Forge API v3, you should use this Forge URL: #{module_repository}")
+            end
 
             command = %W{puppet module install --version #{version} --target-dir}
-            command.push(*[path.to_s, "--module_repository", source.to_s, "--modulepath", path.to_s, "--module_working_dir", path.to_s, "--ignore-dependencies", target])
+            command.push(*[path.to_s, "--module_repository", module_repository, "--modulepath", path.to_s, "--module_working_dir", path.to_s, "--ignore-dependencies", target])
             debug { "Executing puppet module install for #{name} #{version}" }
 
             begin
@@ -130,9 +137,8 @@ module Librarian
 
           def check_puppet_module_options
             min_version    = Gem::Version.create('2.7.13')
-            puppet_version = Gem::Version.create(PUPPET_VERSION.gsub('-', '.'))
 
-            if puppet_version < min_version
+            if Librarian::Puppet.puppet_gem_version < min_version
               raise Error, "To get modules from the forge, we use the puppet faces module command. For this you need at least puppet version 2.7.13 and you have #{puppet_version}"
             end
           end
@@ -220,6 +226,18 @@ module Librarian
 
             new(environment, uri, options)
           end
+
+          def client_api_version()
+            version = 1
+            pe_version = Librarian::Puppet.puppet_version.match(/\(Puppet Enterprise (.+)\)/)
+
+            # Puppet enterprise 3.2.0+ uses api v3
+            if pe_version and Gem::Version.create(pe_version[1].strip) >= Gem::Version.create('3.2.0')
+              version = 3
+            end
+            return version
+          end
+
         end
 
         attr_accessor :environment

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

@@ -1,3 +1,5 @@
+require 'librarian/puppet/util'
+
 begin
   require 'puppet'
   require 'puppet/module_tool'

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: json
   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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -126,18 +126,20 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     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."
+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:
@@ -175,12 +177,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []