puppet-module 0.3.0 → 0.3.2

data/CHANGES.markdown

@@ -1,6 +1,11 @@
 puppet-module changes
 =====================
 
+r0.3.1
+------
+
+* Fixed documentation formatting.
+
 r0.3.0
 ------
 

data/README.markdown

@@ -29,22 +29,20 @@ Running
 
 There are a number of ways to run the `puppet-module` program:
 
-1. *From a source code checkout:* Checkout the source code and from the checkout
-directory, run:
+1. **From an official gem:** Install it by running:
 
-    alias puppet-module=$PWD/bin/puppet-module
+        sudo gem install puppet-module
 
-2. *From a locally-built gem:* Checkout the source code and from the checkout
-directory, run:
+2. **From a locally-built gem:** Checkout the source code and from the checkout directory, run:
 
-    # Build the gem
-    rake gem
-    # Install the file produced by the above command, e.g.:
-    sudo gem install pkg/puppet-module-0.3.0.gem
+        # Build the gem
+        rake gem
+        # Install the file produced by the above command, e.g.:
+        sudo gem install pkg/puppet-module-0.3.0.gem
 
-3. *From an official gem:* Install it by running:
+3. **From a source code checkout:** Checkout the source code and from the checkout directory, run:
 
-    sudo gem install puppet-module
+        alias puppet-module=$PWD/bin/puppet-module
 
 Basics
 ------
@@ -174,6 +172,15 @@ Deleting a module
 The tool does not keep track of what modules you have installed. TO delete a
 module just delete the directory the module was extracted into.
 
+Developing or submitting patches
+--------------------------------
+
+You need the following RubyGems to run the test suite: `mocha`, `rspec`.
+
+You can run the tests with:
+
+    rake spec
+
 Get involved
 ------------
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

data/lib/puppet/module/tool.rb

@@ -46,7 +46,7 @@ module Puppet
         @repository ||= Repository.new(Puppet.settings[:puppet_module_repository])
       end
 
-      FULL_NAME_PATTERN = /\A(.+)[\/\-](.+)\z/
+      FULL_NAME_PATTERN = /\A([^-\/|.]+)[-|\/](.+)\z/
 
       # Return the +username+ and +modname+ for a given +full_name+, or raise an
       # ArgumentError if the argument isn't parseable.

data/lib/puppet/module/tool/applications/installer.rb

@@ -67,7 +67,7 @@ module Puppet::Module::Tool
           begin
             raw_result = read_match(url)
           rescue => e
-            abort "Could not request version match (#{e.message})"
+            abort "Could not find a release for this module (#{e.message})"
           end
           @match = PSON.parse(raw_result)
         end

data/lib/puppet/module/tool/metadata.rb

@@ -39,6 +39,54 @@ module Puppet::Module::Tool
       return @dependencies ||= []
     end
 
+    def author
+      @author || @username
+    end
+
+    def author=(author)
+      @author = author
+    end
+
+    def source
+      @source || 'UNKNOWN'
+    end
+
+    def source=(source)
+      @source = source
+    end
+
+    def license
+      @license || 'UNKNOWN'
+    end 
+
+    def license=(license)
+      @license = license
+    end 
+
+    def summary
+      @summary || 'UNKNOWN'
+    end 
+
+    def summary=(summary)
+      @summary = summary
+    end 
+
+    def description
+      @description || 'UNKNOWN'
+    end 
+
+    def description=(description)
+      @description = description
+    end 
+
+    def project_page
+      @project_page || 'UNKNOWN'
+    end 
+
+    def project_page=(project_page)
+      @project_page = project_page
+    end 
+
     # Return an array of the module's Puppet types, each one is a hash
     # containing :name and :doc.
     # TODO Shouldn't this be it's own class?
@@ -69,6 +117,12 @@ module Puppet::Module::Tool
       return {
         :name         => @full_name,
         :version      => @version,
+        :source       => source,
+        :author       => author,
+        :license      => license,
+        :summary      => summary,
+        :description  => description,
+        :project_page => project_page,
         :dependencies => dependencies,
         :types        => types,
         :checksums    => checksums
@@ -76,5 +130,5 @@ module Puppet::Module::Tool
     end
 
   end
-  
+
 end

data/lib/puppet/module/tool/modulefile.rb

@@ -42,6 +42,35 @@ module Puppet::Module::Tool
       @metadata.dependencies << Dependency.new(name, version_requirement, repository)
     end
 
+    # Set the source
+    def source(source)
+      @metadata.source = source
+    end
+
+    # Set the author or default to +username+
+    def author(author)
+        @metadata.author = author
+    end
+
+    # Set the license
+    def license(license)
+      @metadata.license = license
+    end
+
+   # Set the summary
+   def summary(summary)
+      @metadata.summary = summary
+    end
+
+   # Set the description
+   def description(description)
+      @metadata.description = description
+   end
+
+   # Set the project page
+   def project_page(project_page)
+      @metadata.project_page = project_page
+    end
   end
 
 end

data/lib/puppet/module/tool/repository.rb

@@ -35,8 +35,12 @@ module Puppet::Module::Tool
 
     # Return a Net::HTTPResponse read from this HTTPRequest +request+.
     def read_contact(request)
-      Net::HTTP.start(@uri.host, @uri.port) do |http|
-        http.request(request)
+      begin
+        Net::HTTP.start(@uri.host, @uri.port) do |http|
+          http.request(request)
+        end
+      rescue Errno::ECONNREFUSED, SocketError
+        abort "Could not reach remote repository"
       end
     end
 

data/templates/generator/Modulefile.erb

@@ -1,5 +1,11 @@
 name    '<%= metadata.full_name %>'
 version '0.0.1'
+source '<%= metadata.source %>'
+author '<%= metadata.author %>'
+license '<%= metadata.license %>'
+summary '<%= metadata.summary %>'
+description '<%= metadata.description %>'
+project_page '<%= metadata.project_page %>'
 
 ## Add dependencies, if any:
 # dependency 'username/name', '>= 1.2.0'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-module
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Igal Koshevoy
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 +10:00
+date: 2010-12-31 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -158,6 +159,33 @@ files:
 - vendor/thor-852190ae/lib/thor/parser.rb
 - vendor/thor-852190ae/lib/thor/shell/basic.rb
 - vendor/thor-852190ae/lib/thor/shell/color.rb
+- spec/fixtures/releases/jamtur01-apache/metadata.json
+- spec/fixtures/releases/jamtur01-apache/tests/dev.pp
+- spec/fixtures/releases/jamtur01-apache/tests/vhost.pp
+- spec/fixtures/releases/jamtur01-apache/tests/php.pp
+- spec/fixtures/releases/jamtur01-apache/tests/apache.pp
+- spec/fixtures/releases/jamtur01-apache/tests/ssl.pp
+- spec/fixtures/releases/jamtur01-apache/tests/init.pp
+- spec/fixtures/releases/jamtur01-apache/files/httpd
+- spec/fixtures/releases/jamtur01-apache/files/test.vhost
+- spec/fixtures/releases/jamtur01-apache/Modulefile
+- spec/fixtures/releases/jamtur01-apache/templates/vhost-default.conf.erb
+- spec/fixtures/releases/jamtur01-apache/lib/puppet/provider/a2mod/debian.rb
+- spec/fixtures/releases/jamtur01-apache/lib/puppet/type/a2mod.rb
+- spec/fixtures/releases/jamtur01-apache/manifests/dev.pp
+- spec/fixtures/releases/jamtur01-apache/manifests/vhost.pp
+- spec/fixtures/releases/jamtur01-apache/manifests/params.pp
+- spec/fixtures/releases/jamtur01-apache/manifests/php.pp
+- spec/fixtures/releases/jamtur01-apache/manifests/ssl.pp
+- spec/fixtures/releases/jamtur01-apache/manifests/init.pp
+- spec/spec_helper.rb
+- spec/spec.opts
+- spec/support/stub_http_support.rb
+- spec/support/output_support.rb
+- spec/support/testdir_support.rb
+- spec/unit/application_spec.rb
+- spec/unit/repository_spec.rb
+- spec/integration/cli_spec.rb
 has_rdoc: true
 homepage: http://github.com/puppetlabs/puppet-module-tool
 licenses: []
@@ -179,23 +207,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The Puppet Module Tool manages Puppet modules