librarian-puppet 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f2563b5575e2082f80e0b75f8b1ece49f070a8a
-  data.tar.gz: c37295903ceab4b3406d28f3f90537cd2efa20a1
+  metadata.gz: 010735fe88618f0ecd15edc880fa37086546d776
+  data.tar.gz: fc6e6b124d06ef74f249b813486880649aee3dbd
 SHA512:
-  metadata.gz: 7c9a691b88c4813bc4dc9d90011bc194f8ccf3452ca21eb79359a95652294d049b238b955b3d6fd9fc0f13eebf44ac9e698d60621e683a29675675a20b11c9e6
-  data.tar.gz: 28e9ee98ba396f257dbf233550bc5983c335fe1d85da95e1d5d3621770ef904925b86654c833253dafd446f41a98ebd54e1b5f8457d1e135b7a775e4b2ae9a3d
+  metadata.gz: d65097488d97abe1ca30a251d62e02f3b3cebf0fb7ed1f594c7d98e3adec4e578dddf4e4ed5ffd73ee1627bf5eb4524097359e8777fb368f258fd0eb174bdef4
+  data.tar.gz: 6ee5fc74eebe8a99f970affcfd53949fce28b3926bbd1c0d9bf740e5c24d4297c01e3679f72e4abec5e4076bcb4bed786124cc454fdd36debd3411eca0c3ed6d

data/README.md

@@ -37,17 +37,20 @@ See the [Changelog](Changelog.md) for more details.
 
 ## The Puppetfile
 
-Every Puppet repository that uses Librarian-puppet will have a file named
-`Puppetfile` in the root directory of that repository.  The full specification
-for which modules your puppet infrastructure repository  depends goes in here.
+Every Puppet repository that uses Librarian-puppet may have a file named
+`Puppetfile`, `metadata.json` or `Modulefile` in the root directory of that repository.
+The full specification
+for which modules your puppet infrastructure repository depends goes in here.
 
-### Simple Puppetfile
+### Simple usage
 
-This Puppetfile will download all the dependencies listed in your Modulefile from the Puppet Forge
+If no Puppetfile is present, `librarian-puppet` will download all the dependencies
+listed in your `metadata.json` or `Modulefile` from the Puppet Forge,
+as if the Puppetfile contained
 
     forge "https://forgeapi.puppetlabs.com"
 
-    modulefile
+    metadata
 
 
 ### Example Puppetfile

data/lib/librarian/puppet/action.rb

@@ -0,0 +1 @@
+require "librarian/puppet/action/install"

data/lib/librarian/puppet/action/install.rb

@@ -0,0 +1,24 @@
+module Librarian
+  module Puppet
+    module Action
+      class Install < Librarian::Action::Install
+
+        private
+
+        def create_install_path
+          install_path.rmtree if install_path.exist? && destructive?
+          install_path.mkpath
+        end
+
+        def destructive?
+          environment.config_db.local['destructive'] == 'true'
+        end
+
+        def check_specfile
+          # don't fail if Puppetfile doesn't exist as we'll use the Modulefile or metadata.json
+        end
+
+      end
+    end
+  end
+end

data/lib/librarian/puppet/cli.rb

@@ -2,6 +2,7 @@ require 'librarian/helpers'
 
 require 'librarian/cli'
 require 'librarian/puppet'
+require 'librarian/puppet/action'
 
 module Librarian
   module Puppet
@@ -47,11 +48,6 @@ module Librarian
       option "use-v1-api", :type => :boolean, :default => true
       def install
 
-        unless File.exist?('Puppetfile')
-          say "Could not find Puppetfile in #{Dir.pwd}", :red
-          exit 1
-        end
-
         ensure!
         clean! if options["clean"]
         unless options["destructive"].nil?
@@ -89,6 +85,14 @@ module Librarian
       def version
         say "librarian-puppet v#{Librarian::Puppet::VERSION}"
       end
+
+      private
+
+      # override the actions to use our own
+
+      def install!(options = { })
+        Action::Install.new(environment, options).run
+      end
     end
   end
 end

data/lib/librarian/puppet/dsl.rb

@@ -17,6 +17,14 @@ module Librarian
       def run(specfile = nil, sources = [])
         specfile, sources = nil, specfile if specfile.kind_of?(Array) && sources.empty?
 
+        if specfile.kind_of?(Pathname) and !File.exists?(specfile)
+          debug { "Specfile not found, using defaults: #{specfile}" }
+          specfile = Proc.new do
+            forge "http://forge.puppetlabs.com"
+            metadata
+          end
+        end
+
         Target.new(self).tap do |target|
           target.precache_sources(sources)
           debug_named_source_cache("Pre-Cached Sources", target)
@@ -30,17 +38,20 @@ module Librarian
       end
 
       class Receiver < Librarian::Dsl::Receiver
-        attr_reader :specfile
+        attr_reader :specfile, :working_path
 
         # save the specfile and call librarian
         def run(specfile = nil)
+          @working_path = specfile.kind_of?(Pathname) ? specfile.parent : Pathname.new(Dir.pwd)
           @specfile = specfile
           super
         end
 
         # implement the 'modulefile' syntax for Puppetfile
         def modulefile
-          File.read(Pathname.new(specfile).parent.join('Modulefile')).lines.each do |line|
+          f = modulefile_path
+          raise Error, "Modulefile file does not exist: #{f}" unless File.exists?(f)
+          File.read(f).lines.each do |line|
             regexp = /\s*dependency\s+('|")([^'"]+)\1\s*(?:,\s*('|")([^'"]+)\3)?/
             regexp =~ line && mod($2, $4)
           end
@@ -48,11 +59,28 @@ module Librarian
 
         # implement the 'metadata' syntax for Puppetfile
         def metadata
-          dependencyList = JSON.parse(File.read(Pathname.new(specfile).parent.join('metadata.json')))['dependencies']
+          f = working_path.join('metadata.json')
+          unless File.exists?(f)
+            msg = "Metadata file does not exist: #{f}"
+            # try modulefile, in case we don't have a Puppetfile and we are using the default template
+            if File.exists?(modulefile_path)
+              modulefile
+              return
+            else
+              raise Error, msg
+            end
+          end
+          dependencyList = JSON.parse(File.read(f))['dependencies']
           dependencyList.each do |d|
             mod(d['name'], d['version_requirement'])
           end
         end
+
+        private
+
+        def modulefile_path
+          working_path.join('Modulefile')
+        end
       end
     end
   end

data/lib/librarian/puppet/extension.rb

@@ -13,6 +13,9 @@ module Librarian
     def initialize(name, requirement, source)
       assert_name_valid! name
 
+      # Issue #235 fail if forge source is not defined
+      raise Error, "forge entry is not defined in Puppetfile" if source.instance_of?(Array) && source.empty?
+
       # let's settle on provider-module syntax instead of provider/module
       self.name = normalize_name(name)
       self.requirement = Requirement.new(requirement)
@@ -80,22 +83,6 @@ module Librarian
     end
   end
 
-  module Action
-    class Install < Base
-
-    private
-
-      def create_install_path
-        install_path.rmtree if install_path.exist? && destructive?
-        install_path.mkpath
-      end
-
-      def destructive?
-        environment.config_db.local['destructive'] == 'true'
-      end
-    end
-  end
-
   class ManifestSet
     include Librarian::Puppet::Util
 

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

@@ -94,6 +94,7 @@ module Librarian
           metadata = ::Puppet::ModuleTool::Metadata.new
           begin
             ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
+            raise SyntaxError, "Missing version" unless metadata.version
           rescue ArgumentError, SyntaxError => error
             warn { "Unable to parse #{modulefile}, ignoring: #{error}" }
             if metadata.respond_to? :version=

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Tim Sharpe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
@@ -154,6 +154,8 @@ files:
 - README.md
 - bin/librarian-puppet
 - lib/librarian/puppet.rb
+- lib/librarian/puppet/action.rb
+- lib/librarian/puppet/action/install.rb
 - lib/librarian/puppet/cli.rb
 - lib/librarian/puppet/dsl.rb
 - lib/librarian/puppet/environment.rb