librarian-puppet 0.9.0 → 0.9.1

data/README.md

@@ -101,7 +101,7 @@ stored as a directory under our `puppet-modules` git repos.
 
 Install librarian-puppet:
 
-    $ gem install --pre librarian-puppet
+    $ gem install librarian-puppet
 
 Prepare your puppet infrastructure repository:
 
@@ -162,6 +162,26 @@ Please include:
  * 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.
 
+## Changelog
+
+### 0.9.0
+
+ * Initial release
+
+### 0.9.1
+
+ * Proper error message when a module that is sourced from the forge does not
+   exist.
+ * Added support for annotated tags as git references.
+ * `librarian-puppet init` adds `.tmp/` to gitignore instead of `tmp/`.
+ * Fixed syntax error in the template Puppetfile created by `librarian-puppet
+   init`.
+ * Checks for `lib/puppet` as well as `manifests/` when checking if the git
+   repository is a valid module.
+ * When a user specifies `<foo>/<bar>` as the name of a module sources from a
+   git repository, assume the module name is actually `<bar>`.
+ * Fixed gem description and summary in gemspec.
+
 ## License
 Please see the [LICENSE](https://github.com/rodjek/librarian-puppet/blob/master/LICENSE)
 file.

data/lib/librarian/puppet.rb

@@ -2,6 +2,6 @@ require 'librarian/puppet/extension'
 
 module Librarian
   module Puppet
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
   end
 end

data/lib/librarian/puppet/cli.rb

@@ -27,7 +27,7 @@ module Librarian
           gitignore = []
         end
 
-        gitignore << "tmp/" unless gitignore.include? "tmp/"
+        gitignore << ".tmp/" unless gitignore.include? ".tmp/"
         gitignore << "modules/" unless gitignore.include? "modules/"
 
         File.open(".gitignore", 'w') do |f|

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

@@ -21,6 +21,10 @@ module Librarian
 
           def versions
             data = api_call("#{name}.json")
+            if data.nil?
+              raise Error, "Unable to find module '#{name}' on #{source}"
+            end
+
             data['releases'].map { |r| r['version'] }.sort.reverse
           end
 
@@ -79,9 +83,12 @@ module Librarian
           def api_call(path)
             base_url = source.to_s
             resp = Net::HTTP.get_response(URI.parse("#{base_url}/#{path}"))
-            data = resp.body
-
-            JSON.parse(data)
+            if resp.code.to_i != 200
+              nil
+            else
+              data = resp.body
+              JSON.parse(data)
+            end
           end
         end
 

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

@@ -2,6 +2,22 @@ require 'librarian/source/git'
 require 'librarian/puppet/source/local'
 
 module Librarian
+  module Source
+    class Git
+      class Repository
+        def hash_from(remote, reference)
+          branch_names = remote_branch_names[remote]
+          if branch_names.include?(reference)
+            reference = "#{remote}/#{reference}"
+          end
+
+          command = %W(rev-parse #{reference}^{commit} --quiet)
+          run!(command, :chdir => true).strip
+        end
+      end
+    end
+  end
+
   module Puppet
     module Source
       class Git < Librarian::Source::Git

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

@@ -11,6 +11,12 @@ module Librarian
           name, version = manifest.name, manifest.version
           found_path = found_path(name)
 
+          if name.include? '/'
+            new_name = name.split('/').last
+            debug { "Invalid module name '#{name}', guessing you meant '#{new_name}'" }
+            name = new_name
+          end
+
           install_path = environment.install_path.join(name)
           if install_path.exist?
             debug { "Deleting #{relative_path_to(install_path)}" }
@@ -38,7 +44,9 @@ module Librarian
         end
 
         def manifest?(name, path)
-          path.join('manifests').exist?
+          return true if path.join('manifests').exist?
+          return true if path.join('lib').join('puppet').exist?
+          false
         end
       end
     end

data/lib/librarian/puppet/templates/Puppetfile

@@ -1,5 +1,9 @@
-# mod 'stdlib'
-#   :git => 'git://github.com/puppetlabs/puppetlabs-stdlib.git
+forge "http://forge.puppetlabs.com"
+
+# mod 'puppetlabs/stdlib'
+
+# mod 'ntp',
+#   :git => 'git://github.com/puppetlabs/puppetlabs-ntp.git'
 
 # mod 'apt',
 #   :git => 'https://github.com/puppetlabs/puppetlabs-apt.git',

data/librarian-puppet.gemspec

@@ -9,8 +9,10 @@ Gem::Specification.new do |s|
   s.authors = ['Tim Sharpe']
   s.email = ['tim@sharpe.id.au']
   s.homepage = 'https://github.com/rodjek/librarian-puppet'
-  s.summary = 'placeholder'
-  s.description = 'another placeholder!'
+  s.summary = 'Bundler for your Puppet modules'
+  s.description = 'Simplify deployment of your Puppet infrastructure by
+  automatically pulling in modules from the forge and git repositories with
+  a single command.'
 
   s.files = [
     '.gitignore',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70190725563440 !ruby/object:Gem::Requirement
+  requirement: &70127102525360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.15'
   type: :runtime
   prerelease: false
-  version_requirements: *70190725563440
+  version_requirements: *70127102525360
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70190725562580 !ruby/object:Gem::Requirement
+  requirement: &70127102524860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,8 +32,9 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190725562580
-description: another placeholder!
+  version_requirements: *70127102524860
+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:
 - tim@sharpe.id.au
 executables:
@@ -171,5 +172,5 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: placeholder
+summary: Bundler for your Puppet modules
 test_files: []