r10k 1.0.0rc4 → 1.0.0

data/lib/r10k/cli/deploy.rb

@@ -15,6 +15,11 @@ module R10K::CLI
         usage   'deploy <subcommand>'
         summary 'Puppet dynamic environment deployment'
 
+        description <<-DESCRIPTION
+`r10k deploy` implements the Git branch to Puppet environment workflow
+(https://puppetlabs.com/blog/git-workflow-and-puppet-environments/).
+        DESCRIPTION
+
         required :c, :config, 'Specify a configuration file'
 
         run do |opts, args, cmd|
@@ -31,6 +36,20 @@ module R10K::CLI
           usage   'environment <options> <environment> <...>'
           summary 'deploy environments and their dependent modules'
 
+          description <<-DESCRIPTION
+`r10k deploy environment` creates and updates Puppet environments based on Git
+branches.
+
+Environments can provide a Puppetfile at the root of the directory to deploy
+independent Puppet modules. To recursively deploy an environment, pass the
+`--puppetfile` flag to the command.
+
+**NOTE**: If an environment has a Puppetfile when it is instantiated a
+recursive update will be forced. It is assumed that environments are dependent
+on modules specified in the Puppetfile and an update will be automatically
+scheduled. On subsequent deployments, Puppetfile deployment will default to off.
+          DESCRIPTION
+
           flag :p, :puppetfile, 'Deploy modules from a puppetfile'
 
           run do |opts, args, cmd|
@@ -61,6 +80,12 @@ module R10K::CLI
           usage 'module [module] <module ...>'
           summary 'deploy modules in all environments'
 
+          description <<-DESCRIPTION
+`r10k deploy module` Deploys and updates modules inside of Puppet environments.
+It will load the Puppetfile configurations out of all environments, and will
+try to deploy the given module names in all environments.
+          DESCRIPTION
+
           run do |opts, args, cmd|
             deploy = R10K::Deployment.load_config(opts[:config])
 

data/lib/r10k/cli/puppetfile.rb

@@ -11,6 +11,11 @@ module R10K::CLI
         usage   'puppetfile <subcommand>'
         summary 'Perform operations on a Puppetfile'
 
+        description <<-DESCRIPTION
+`r10k puppetfile` provides an implementation of the librarian-puppet style
+Puppetfile (http://bombasticmonkey.com/librarian-puppet/).
+        DESCRIPTION
+
         run do |opts, args, cmd|
           puts cmd.help(:verbose => opts[:verbose])
           exit 0

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '1.0.0rc4'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.0.0rc4
-  prerelease: 5
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -194,9 +194,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -209,4 +209,3 @@ test_files:
 - spec/unit/git/cache_spec.rb
 - spec/unit/deployment/environment_spec.rb
 - spec/unit/module/forge_spec.rb
-has_rdoc: