r10k 0.0.9 → 1.0.0rc1

data/bin/r10k

@@ -11,7 +11,7 @@ rescue Interrupt
 rescue SystemExit => e
   exit(e.status)
 rescue Exception => e
-  $stderr.puts "\nRuntime error: #{e.inspect}".red
+  $stderr.puts "\nError while running: #{e.inspect}".red
   $stderr.puts e.backtrace.join("\n").red if ARGV.include? '--trace'
   exit(1)
 end

data/lib/r10k.rb

@@ -1,7 +1,3 @@
 module R10K; end
 
-require 'r10k/root'
-require 'r10k/synchro/git'
-require 'r10k/librarian'
 require 'r10k/version'
-require 'r10k/logging'

data/lib/r10k/cli.rb

@@ -1,6 +1,8 @@
 require 'r10k'
 require 'r10k/logging'
+require 'r10k/version'
 require 'r10k/cli/ext/logging'
+
 require 'cri'
 
 module R10K::CLI
@@ -19,16 +21,16 @@ module R10K::CLI
         exit 0
       end
 
-      required :c, :config, 'Specify a configuration file' do |value, cmd|
-        R10K::Deployment.config.configfile = value
-      end
-
       required :v, :verbose, 'Set verbosity level' do |value, cmd|
         R10K::Logging.level = Integer(value)
       end
 
       flag :t, :trace, 'Display stack traces on application crash'
 
+      required :c, :config, 'Specify a configuration file' do |value, cmd|
+        logger.warn "Calling `r10k --config <action>` as a global option is deprecated; use r10k <action> --config"
+      end
+
       run do |opts, args, cmd|
         puts cmd.help
         exit 0
@@ -37,7 +39,9 @@ module R10K::CLI
   end
 end
 
+require 'r10k/cli/deploy'
 require 'r10k/cli/environment'
 require 'r10k/cli/module'
-require 'r10k/cli/cache'
 require 'r10k/cli/synchronize'
+require 'r10k/cli/puppetfile'
+require 'r10k/cli/version'

data/lib/r10k/cli/deploy.rb

@@ -0,0 +1,108 @@
+require 'r10k/cli'
+require 'r10k/deployment'
+require 'r10k/deployment/config'
+
+require 'r10k/task_runner'
+require 'r10k/task/deployment'
+
+require 'cri'
+
+module R10K::CLI
+  module Deploy
+    def self.command
+      @cmd ||= Cri::Command.define do
+        name    'deploy'
+        usage   'deploy <subcommand>'
+        summary 'Puppet dynamic environment deployment'
+
+        required :c, :config, 'Specify a configuration file'
+
+        run do |opts, args, cmd|
+          puts cmd.help
+          exit 0
+        end
+      end
+    end
+
+    module Environment
+      def self.command
+        @cmd ||= Cri::Command.define do
+          name    'environment'
+          usage   'environment <options> <environment> <...>'
+          summary 'deploy environments and their dependent modules'
+
+          flag :p, :puppetfile, 'Deploy modules from a puppetfile'
+
+          run do |opts, args, cmd|
+            deploy = R10K::Deployment.load_config(opts[:config])
+
+            task = R10K::Task::Deployment::DeployEnvironments.new(deploy)
+            task.update_puppetfile = opts[:puppetfile]
+            task.environment_names = args
+
+            purge = R10K::Task::Deployment::PurgeEnvironments.new(deploy)
+
+            runner = R10K::TaskRunner.new(:trace => opts[:trace])
+            runner.append_task task
+            runner.append_task purge
+            runner.run
+
+            exit runner.exit_value
+          end
+        end
+      end
+    end
+    self.command.add_command(Environment.command)
+
+    module Module
+      def self.command
+        @cmd ||= Cri::Command.define do
+          name  'module'
+          usage 'module [module] <module ...>'
+          summary 'deploy modules in all environments'
+
+          run do |opts, args, cmd|
+            deploy = R10K::Deployment.load_config(opts[:config])
+
+            task = R10K::Task::Deployment::DeployModules.new(deploy)
+            task.module_names = args
+
+            runner = R10K::TaskRunner.new(:trace => opts[:trace])
+            runner.append_task task
+            runner.run
+
+            exit runner.exit_value
+          end
+        end
+      end
+    end
+    self.command.add_command(Module.command)
+
+    module Display
+      def self.command
+        @cmd ||= Cri::Command.define do
+          name  'display'
+          usage 'display'
+          summary 'Display environments and modules in the deployment'
+
+          flag :p, :puppetfile, 'Display Puppetfile modules'
+
+          run do |opts, args, cmd|
+            deploy = R10K::Deployment.load_config(opts[:config])
+
+            task = R10K::Task::Deployment::Display.new(deploy)
+            task.puppetfile = opts[:puppetfile]
+
+            runner = R10K::TaskRunner.new(:trace => opts[:trace])
+            runner.prepend_task task
+            runner.run
+
+            exit runner.exit_value
+          end
+        end
+      end
+    end
+    self.command.add_command(Display.command)
+  end
+  self.command.add_command(Deploy.command)
+end

data/lib/r10k/cli/environment.rb

@@ -7,7 +7,11 @@ module R10K::CLI
       @cmd ||= Cri::Command.define do
         name  'environment'
         usage 'environment <subcommand>'
-        summary 'Operate on a specific environment'
+        summary 'DEPRECATED: Operate on a specific environment'
+
+        required :c, :config, 'Specify a configuration file'
+
+        be_hidden
 
         run do |opts, args, cmd|
           puts cmd.help

data/lib/r10k/cli/environment/deploy.rb

@@ -1,9 +1,6 @@
 require 'r10k/cli/environment'
-require 'r10k/deployment'
-require 'r10k/action'
-
+require 'r10k/cli/deploy'
 require 'cri'
-require 'middleware'
 
 module R10K::CLI::Environment
   module Deploy
@@ -11,35 +8,16 @@ module R10K::CLI::Environment
       @cmd ||= Cri::Command.define do
         name  'deploy'
         usage 'deploy <environment> <...>'
-        summary 'Deploy an environment'
+        summary 'DEPRECATED: Deploy an environment'
 
         flag :r, :recurse, 'Recursively update submodules'
         flag :u, :update, "Enable or disable cache updating"
 
-        run do |opts, args, cmd|
-          deployment = R10K::Deployment.instance
-          env_list   = deployment.environments
-
-          if not args.empty?
-            environments = env_list.select {|env| args.include? env.name }
-          else
-            environments = env_list
-          end
+        be_hidden
 
-          stack = Middleware::Builder.new do
-            environments.each do |env|
-              use R10K::Action::Environment::Deploy, env
-            end
-          end
-
-          # Prepare middleware environment
-          stack_env = {
-            :update_cache => opts[:update],
-            :recurse      => opts[:recurse],
-            :trace        => opts[:trace],
-          }
-
-          stack.call(stack_env)
+        run do |opts, args, cmd|
+          logger.warn "This command is deprecated; please use `r10k deploy environment`"
+          R10K::CLI::Deploy::Environment.command.block.call(opts,args,cmd)
         end
       end
     end

data/lib/r10k/cli/environment/list.rb

@@ -1,5 +1,5 @@
 require 'r10k/cli/environment'
-require 'r10k/deployment'
+require 'r10k/cli/deploy'
 require 'cri'
 
 module R10K::CLI::Environment
@@ -8,17 +8,13 @@ module R10K::CLI::Environment
       @cmd ||= Cri::Command.define do
         name  'list'
         usage 'list'
-        summary 'List all available environments'
+        summary 'DEPRECATED: List all available environments'
 
-        run do |opts, args, cmd|
-          deployment = R10K::Deployment.instance
-          output = deployment.environments.inject('') do |str, root|
-            str << "  - "
-            str << "#{root.name}: #{root.full_path}"
-            str << "\n"
-          end
+        be_hidden
 
-          puts output
+        run do |opts, args, cmd|
+          logger.warn "This command is deprecated; please use `r10k deploy display`"
+          R10K::CLI::Deploy::Display.command.block.call(opts,args,cmd)
         end
       end
     end

data/lib/r10k/cli/environment/stale.rb

@@ -8,24 +8,14 @@ module R10K::CLI::Environment
       @cmd ||= Cri::Command.define do
         name  'stale'
         usage 'stale <directory> [directory ...]'
-        summary 'List all stale environments'
+        summary 'REMOVED: List all stale environments'
 
-        run do |opts, args, cmd|
-          deployment = R10K::Deployment.instance
-
-          if args.empty?
-            $stderr.print "ERROR: ".red
-            $stderr.puts "#{cmd.name} requires one or more directories"
-            $stderr.puts cmd.help
-            exit(1)
-          end
+        description "This command has been removed in 1.0.0"
+        be_hidden
 
-          args.each do |dir|
-            puts "Stale environments in #{dir}:"
-            output = deployment.collection.stale(dir).each do |stale_dir|
-              puts "  - #{stale_dir}"
-            end
-          end
+        run do |opts, args, cmd|
+          $stderr.puts "#{cmd.name} has been removed in 1.0.0"
+          exit 1
         end
       end
     end

data/lib/r10k/cli/module.rb

@@ -7,7 +7,11 @@ module R10K::CLI
       @cmd ||= Cri::Command.define do
         name  'module'
         usage 'module <subcommand>'
-        summary 'Operate on a specific puppet module'
+        summary 'DEPRECATED: Operate on a specific puppet module'
+
+        be_hidden
+
+        required :c, :config, 'Specify a configuration file'
 
         required :e, :environment, 'Specify a particular environment'
 

data/lib/r10k/cli/module/deploy.rb

@@ -11,42 +11,15 @@ module R10K::CLI::Module
       @cmd ||= Cri::Command.define do
         name  'deploy'
         usage 'deploy [module name] <module name> ...'
-        summary 'Deploy a module'
+        summary 'DEPRECATED: Deploy a module'
+
+        be_hidden
 
         flag :u, :update, "Update module cache"
 
         run do |opts, args, cmd|
-
-          unless (module_name = args[0])
-            puts cmd.help
-            exit 1
-          end
-
-          env_list = R10K::Deployment.instance.environments
-
-          if opts[:environment]
-            environments = env_list.select {|env| env.name == opts[:environment]}
-          else
-            environments = env_list
-          end
-
-          environments.each do |env|
-            mods = env.modules.select { |mod| mod.name == module_name }
-
-            if mods.empty?
-              logger.warn "No modules with name #{module_name} matched in environment #{env.name.inspect}".red
-            end
-
-            stack = Middleware::Builder.new
-            mods.each { |mod| stack.use R10K::Action::Module::Deploy, mod }
-
-            stack_env = {
-              :update_cache => opts[:update],
-              :trace        => opts[:trace],
-            }
-
-            stack.call(stack_env)
-          end
+          logger.warn "This command is deprecated; please use `r10k deploy module`"
+          R10K::CLI::Deploy::Module.command.block.call(opts,args,cmd)
         end
       end
     end

data/lib/r10k/cli/module/list.rb

@@ -1,5 +1,5 @@
 require 'r10k/cli/module'
-require 'r10k/deployment'
+require 'r10k/cli/deploy'
 require 'cri'
 
 module R10K::CLI::Module
@@ -8,34 +8,13 @@ module R10K::CLI::Module
       @cmd ||= Cri::Command.define do
         name  'list'
         usage 'list'
-        summary 'List modules that are instantiated in environments'
+        summary 'DEPRECATED: List modules that are instantiated in environments'
 
-        run do |opts, args, cmd|
-          deployment = R10K::Deployment.instance
-          env_list   = deployment.environments
-
-          update_cache = (defined? opts[:update]) ? (opts[:update] == 'true') : false
-
-          if opts[:environment]
-            environments = env_list.select {|env| env.name == opts[:environment]}
-          else
-            environments = env_list
-          end
-
-          printree = {}
+        be_hidden
 
-          environments.each do |env|
-            module_names = env.modules.map(&:name)
-
-            printree[env.name] = module_names
-          end
-
-          printree.each_pair do |env_name, mod_list|
-            puts "  - #{env_name}"
-            mod_list.each do |mod|
-              puts "      #{mod}"
-            end
-          end
+        run do |opts, args, cmd|
+          logger.warn "This command is deprecated; please use `r10k deploy display`"
+          R10K::CLI::Deploy::Display.command.block.call(opts,args,cmd)
         end
       end
     end

data/lib/r10k/cli/puppetfile.rb

@@ -0,0 +1,76 @@
+require 'r10k/cli'
+require 'r10k/puppetfile'
+
+require 'cri'
+
+module R10K::CLI
+  module Puppetfile
+    def self.command
+      @cmd ||= Cri::Command.define do
+        name    'puppetfile'
+        usage   'puppetfile <subcommand>'
+        summary 'Perform operations on a Puppetfile'
+
+        run do |opts, args, cmd|
+          puts cmd.help
+          exit 0
+        end
+      end
+    end
+
+    module Install
+      def self.command
+        @cmd ||= Cri::Command.define do
+          name    'install'
+          usage   'install'
+          summary 'Install all modules from a Puppetfile'
+
+          run do |opts, args, cmd|
+            puppetfile_root = Dir.getwd
+            puppetfile_path = ENV['PUPPETFILE_DIR']
+            puppetfile      = ENV['PUPPETFILE']
+
+            puppetfile = R10K::Puppetfile.new(puppetfile_root, puppetfile_path, puppetfile)
+
+            runner = R10K::TaskRunner.new(opts)
+            task   = R10K::Task::Puppetfile::Sync.new(puppetfile)
+            runner.append_task task
+
+            runner.run
+
+            exit runner.exit_value
+          end
+        end
+      end
+    end
+    self.command.add_command(Install.command)
+
+    module Purge
+      def self.command
+        @cmd ||= Cri::Command.define do
+          name  'purge'
+          usage 'purge'
+          summary 'Purge unmanaged modules from a Puppetfile managed directory'
+
+          run do |opts, args, cmd|
+            puppetfile_root = Dir.getwd
+            puppetfile_path = ENV['PUPPETFILE_DIR']
+            puppetfile      = ENV['PUPPETFILE']
+
+            puppetfile = R10K::Puppetfile.new(puppetfile_root, puppetfile_path, puppetfile)
+
+            runner = R10K::TaskRunner.new(opts)
+            task   = R10K::Task::Puppetfile::Purge.new(puppetfile)
+            runner.append_task task
+
+            runner.run
+
+            exit runner.exit_value
+          end
+        end
+      end
+    end
+    self.command.add_command(Purge.command)
+  end
+  self.command.add_command(Puppetfile.command)
+end