baptize 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21ee15f5fa163ebaa24036c18ed5f7aed06e4ba5
-  data.tar.gz: b6606c765e138843fc0cce48d87a0c76f686db24
+  metadata.gz: ad98ebdbe3b5c570e1b16afd971758d7be6b8c94
+  data.tar.gz: f10151aab4e40be681ebf14c6e66f4881f63fbd0
 SHA512:
-  metadata.gz: bc396d66c705cfd836ddbb777e1cb0d577216075e0124635ec120f2ffc24ce622c787eea5047cb928957c02c72a2719bf90a0e56d48c3f4df59349f041825d39
-  data.tar.gz: 54ef22187f9def94e2b44b825de22f4507fa63384b5efb8876d2d729ef63c169e453859348a03999432c5ff01f92d32e13b92630eb355e3fc822c0e7b1593b36
+  metadata.gz: 2f737a1d1f690fafe84ccf3141ba1e4691b19416895079a1093f9b245c9135ee8c1148c69fbadd2388b7a48cec68d54dc84af7cbf32a23b41e418b2e04ca53f5
+  data.tar.gz: 194aa44252afe3379155932a781dbb81440cecb3d426dec36a6365f86bc59211b7d5162b33b7cc22c737f283c85b1be43b8fa10284a8bf858b37cb79ccc4d280

data/lib/baptize/application.rb

@@ -1,111 +1,180 @@
+require 'shellwords'
+require 'optparse'
+
 module Baptize
-  class Application < Rake::Application
 
-    def initialize
-      super
-      @rakefiles = %w(bapfile Bapfile bapfile.rb Bapfile.rb)
-      Rake.application = self
-      require 'baptize/rake'
+  class << self
+    attr_accessor :application
+  end
+
+  class Command
+    attr_reader :name, :description, :block
+
+    def initialize(name, description=nil, &block)
+      @name, @description, @block = name.to_sym, description, block
+    end
+
+    def invoke(*args)
+      block.call(*args)
     end
 
-    def name
-      "baptize"
+  end # class Command
+
+  # Most of this is copy-paste fom Rake::Application
+  # https://github.com/ruby/rake/blob/master/lib/rake/application.rb
+  class Application
+
+    attr_accessor :commands
+
+    def initialize
+      @original_dir = Dir.pwd
+      @bapfiles = %w(bapfile Bapfile bapfile.rb Bapfile.rb)
+      @commands = {}
+      Baptize.application = self
+      load 'baptize/commands.rb'
     end
 
-    def load_rakefile
-      super
+    def run
       standard_exception_handling do
-        in_namespace :packages do
-          Baptize::Registry.packages.values.each do |package|
-            @last_description = package.description
-            define_task(Rake::Task, package.name.to_s) do
-              puts "Invoke package: #{package.name}"
-              Baptize::Registry.policies.keys.each do |role|
-                on roles(role), in: :parallel do |host|
-                  Baptize::Registry.execution_scope.set :current_host, host
-                  Baptize::Registry.execution_scope.set :current_ssh_connection, ssh_connection
-                  package.execute
-                end
-              end
-            end
-          end
-        end
+        parse_input
+        load_bapfile
+        dispatch
       end
     end
 
-    def sort_options(options)
-      super.push(version, dry_run, roles)
+    def define_command(name, description=nil, &block)
+      Command.new(name, description, &block).tap do |command|
+        @commands[command.name] = command
+      end
     end
 
-    def handle_options
-      options.rakelib = ['rakelib']
-      options.trace_output = $stderr
-
-      OptionParser.new do |opts|
-        opts.banner = "Baptize prepares your servers"
-        opts.separator ""
-        opts.separator "Show available tasks:"
-        opts.separator "    bundle exec baptize -T"
+    def parse_input
+      @arguments = OptionParser.new do |opts|
+        opts.banner = "baptize [OPTIONS] COMMAND"
         opts.separator ""
-        opts.separator "Invoke (or simulate invoking) a task:"
-        opts.separator "    bundle exec baptize [--dry-run] TASK"
+        opts.separator "COMMANDS are ..."
+
+        width = [commands.values.map(&:name).map(&:length), 31].flatten.max
+        commands.values.each do |command|
+          opts.separator sprintf("    %-#{width}s  %s\n",
+            command.name,
+            command.description)
+        end
+
         opts.separator ""
-        opts.separator "Advanced options:"
+        opts.separator "OPTIONS are ..."
 
         opts.on_tail("-h", "--help", "-H", "Display this help message.") do
           puts opts
           exit
         end
 
-        standard_rake_options.each { |args| opts.on(*args) }
-        opts.environment('RAKEOPT')
-      end.parse!
+        opts.on('--bapfile', '-f [FILENAME]', "Use FILENAME as the bapfile to search for.") do |value|
+          value ||= ''
+          @bapfiles.clear
+          @bapfiles << value
+        end
+
+        opts.on('--verbose', '-v', "Log message to standard output.") do |value|
+          Registry.execution_scope.set :verbose, true
+        end
+
+        opts.on('--version', '-V', "Display the program version.") do |value|
+          puts "baptize, version #{Baptize::VERSION}"
+          exit
+        end
+
+      end.parse(ARGV)
+    end
+
+    def dispatch
+      args = @arguments.dup
+      command_name = args.shift&.to_sym
+      fail "No command given. Try baptize --help" if command_name.nil?
+      command = commands[command_name]
+      fail "Invalid command #{command_name}" unless command
+      command.invoke(*args)
+    end
+
+    def load_bapfile
+      standard_exception_handling do
+        raw_load_bapfile
+      end
+    end
+
+    def raw_load_bapfile # :nodoc:
+      bapfile, location = find_bapfile_location
+      fail "No Bapfile found (looking for: #{@bapfiles.join(', ')})" if bapfile.nil?
+      @bapfile = bapfile
+      Dir.chdir(location)
+      print_bapfile_directory(location)
+      load(File.expand_path(@bapfile)) if @bapfile && @bapfile != ''
     end
 
+    def print_bapfile_directory(location) # :nodoc:
+      $stderr.puts "(in #{Dir.pwd})" unless @original_dir == location
+    end
 
-    def display_error_message(ex)
-      unless options.backtrace
-        if (loc = Rake.application.find_rakefile_location)
-          whitelist = (@imported.dup << loc[0]).map{|f| File.absolute_path(f, loc[1])}
-          pattern = %r@^(?!#{whitelist.map{|p| Regexp.quote(p)}.join('|')})@
-          Rake.application.options.suppress_backtrace_pattern = pattern
+    def find_bapfile_location # :nodoc:
+      here = Dir.pwd
+      until (fn = have_bapfile)
+        Dir.chdir("..")
+        return nil if Dir.pwd == here # || options.nosearch
+        here = Dir.pwd
+      end
+      [fn, here]
+    ensure
+      Dir.chdir(@original_dir)
+    end
+
+    # True if one of the files in BAPFILES is in the current directory.
+    # If a match is found, it is copied into @bapfile.
+    def have_bapfile # :nodoc:
+      @bapfiles.each do |fn|
+        if File.exist?(fn)
+          others = Dir.glob(fn, File::FNM_CASEFOLD).sort
+          return others.size == 1 ? others.first : fn
+        elsif fn == ''
+          return fn
         end
-        trace "(Backtrace restricted to imported tasks)"
       end
-      super
-    end
-
-    private
-
-    def version
-      ['--version', '-V',
-       "Display the program version.",
-       lambda { |_value|
-         require 'capistrano/version'
-         puts "Baptize Version: #{Baptize::VERSION} (Capistrano Version: #{Capistrano::VERSION}, Rake Version: #{RAKEVERSION})"
-         exit
-       }
-      ]
-    end
-
-    def dry_run
-      ['--dry-run', '-n',
-       "Do a dry run without executing actions",
-       lambda { |_value|
-         raise "TODO: Port this"
-         Configuration.env.set(:sshkit_backend, SSHKit::Backend::Printer)
-       }
-      ]
-    end
-
-    def roles
-      ['--roles ROLES', '-r',
-       "Run SSH commands only on hosts matching these roles",
-       lambda { |value|
-         raise "TODO: Port this"
-         Configuration.env.add_cmdline_filter(:role, value)
-       }
-      ]
+      return nil
+    end
+
+    def bapfile_location(backtrace=caller) # :nodoc:
+      backtrace.map { |t| t[/([^:]+):/, 1] }
+
+      re = /^#{@bapfile}$/
+      re = /#{re.source}/i if windows?
+
+      backtrace.find { |str| str =~ re } || ''
+    end
+
+    # Provide standard exception handling for the given block.
+    def standard_exception_handling # :nodoc:
+      yield
+    rescue SystemExit
+      # Exit silently with current status
+      raise
+    rescue OptionParser::InvalidOption => ex
+      $stderr.puts ex.message
+      exit(false)
+    rescue Exception => ex
+      # Exit with error message
+      display_error_message(ex)
+      exit_because_of_exception(ex)
+    end
+
+    # Display the error message that caused the exception.
+    def display_error_message(ex) # :nodoc:
+      $stderr.puts "Error during processing: #{$!}"
+      $stderr.puts ex.backtrace.join("\n\t")
+    end
+
+    # Exit the program because of an unhandled exception.
+    # (may be overridden by subclasses)
+    def exit_because_of_exception(ex) # :nodoc:
+      exit(false)
     end
 
   end

data/lib/baptize/commands.rb

@@ -0,0 +1,46 @@
+Baptize.application.define_command :list, "Shows list of all available packages" do
+  puts "# Packages"
+  packages = Baptize::Registry.packages.values
+  width = packages.map(&:name).map(&:length).max
+  packages.each do |p|
+    printf("%-#{width}s  # %s\n",
+      p.name,
+      p.description)
+  end
+end
+
+Baptize.application.define_command :policies, "Shows configured policies" do
+  puts "# Policies"
+  registry = Baptize::Registry
+  registry.policies.each do |role, packages|
+    puts "#{role}:"
+    packages.each do |package|
+      puts "  #{package}"
+    end
+  end
+end
+
+Baptize.application.define_command :servers, "Show list of configured servers" do
+  puts "# Servers"
+  registry = Baptize::Registry
+  registry.servers.values.each do |server|
+    puts server.inspect
+  end
+end
+
+Baptize.application.define_command :deploy, "Deploys the configured policies to remote servers" do
+  registry = Baptize::Registry
+  registry.policies.keys.each do |role|
+    registry.for_role role, in: :parallel do |host|
+      registry.apply_policy role, host, self
+    end
+  end
+end
+
+Baptize.application.define_command :info, "Shows configuration" do
+  Baptize.application.commands[:list].invoke
+  puts
+  Baptize.application.commands[:policies].invoke
+  puts
+  Baptize.application.commands[:servers].invoke
+end

data/lib/baptize/version.rb

@@ -1,3 +1,3 @@
 module Baptize
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end # module Baptize

data/lib/baptize.rb

@@ -1,4 +1,4 @@
-require 'rake'
+# require 'rake'
 require 'sshkit'
 require 'baptize/version'
 require 'baptize/registry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baptize
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Troels Knak-Nielsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -51,6 +51,7 @@ files:
 - bin/baptize
 - lib/baptize.rb
 - lib/baptize/application.rb
+- lib/baptize/commands.rb
 - lib/baptize/dsl.rb
 - lib/baptize/execution_scope.rb
 - lib/baptize/package_definition.rb