trooper 0.6.0.alpha1 → 0.6.0.alpha2

data/README.md

@@ -4,6 +4,11 @@ Trooper is designed to give you the flexibility to deploy your code to any serve
 You design your deployment strategy to best fit your application and its needs. 
 Trooper comes with some built in actions that you can use in your own strategies or come up with entirely new ones.
 
+#### Please give me a try on your small project for now
+
+We have been using earlier versions of trooper were I work for the best part of 2 years, 
+but I re-wrote it for public release and so has lost a lot of its maturity.
+
 ## Installation
 
 1. Super easy! `gem install trooper` or add it to your Gemfile `gem 'trooper'`

data/lib/trooper/actions/update_repository_action.rb

@@ -26,6 +26,10 @@ module Trooper
         run "git pull origin #{branch} -q"
         run "git gc --aggressive"
       end
+
+      def branch
+        config[:branch] || 'master'
+      end
       
     end
 

data/lib/trooper/cli.rb

@@ -18,16 +18,21 @@ module Trooper
       @options = { :environment => :production }
 
       @command = option_parser.parse!(@argv)[0]
-      raise CliArgumentError, "You didnt pass an action" if @command == nil
+      
+      if @command 
+        @command = @command.to_sym
+      else
+        raise CliArgumentError, "You didnt pass an action"
+      end
     end
 
     def execute
-      case command.to_sym
+      case command
       when :init
         Configuration.init
       else
         config = Configuration.new(options)
-        config.execute action
+        config.execute command
       end
     end
 
@@ -38,7 +43,8 @@ module Trooper
         op.banner = 'Usage: trooper <command> [options]'      
         op.separator ''
 
-        op.on "-d", "--debug", "Debuy" do 
+        op.on "-d", "--debug", "Debuy" do
+          $trooper_log_level = ::Logger::DEBUG
           @options[:debug] = true
         end
 

data/lib/trooper/config/action.rb

@@ -25,6 +25,7 @@ module Trooper
 
       def load_default_actions!
         DEFAULT_ACTIONS.each do |klass|
+          Trooper.logger.debug "loaded #{klass.to_s}"
           Trooper::Arsenal.actions.add klass.new
         end
       end

data/lib/trooper/logger.rb

@@ -7,9 +7,10 @@ module Trooper
   class Logger < ::Logger
     ACTION = 6
     SUCCESS = 7
+    STRATEGY = 8
 
-    # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN < ACTION < SUCCESS
-    LABELS = %w(DEBUG INFO WARN ERROR FATAL ANY ACTION SUCCESS)
+    # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN < ACTION < SUCCESS < STRATEGY
+    LABELS = %w(DEBUG INFO WARN ERROR FATAL ANY ACTION SUCCESS STRATEGY)
 
     def action(progname = nil, &block)
       add(ACTION, nil, progname, &block)
@@ -19,6 +20,10 @@ module Trooper
       add(SUCCESS, nil, progname, &block)
     end
 
+    def strategy(progname = nil, &block)
+      add(STRATEGY, nil, progname, &block)
+    end
+
     private
 
     def format_severity(severity)
@@ -52,6 +57,8 @@ module Trooper
         colour("#{progname} => [#{severity}] #{message}\n", :magenta)
       when "SUCCESS"
         colour("#{progname} => [#{severity}] #{message}\n", :green)
+      when "STRATEGY"
+        colour("#{progname} => [#{severity}] #{message}\n", :cyan)
       when "ERROR", "FATAL"
         colour("#{progname} => [#{severity}] #{message}\n", :red)
       else
@@ -71,11 +78,10 @@ module Trooper
     
   end
 
-
   def self.logger
     @logger ||= begin
       logger = Logger.new($stdout)
-      logger.level = ::Logger::DEBUG
+      logger.level = $trooper_log_level || ::Logger::INFO
       logger.progname = 'Trooper'
       logger.formatter = LogFormat.new
       logger

data/lib/trooper/strategy.rb

@@ -14,6 +14,7 @@ module Trooper
     def execute(config = {})
       @config = config
       Trooper.logger.debug "Configuration\n#{config}"
+      Trooper.logger.strategy description
       successful = nil
 
       runners.each do |runner|
@@ -52,7 +53,7 @@ module Trooper
     end
 
     def actions(*action_names)
-      [*action_names].each do |name|
+      [*action_names].each do |name| 
         @run_list << [:action, name]
       end
     end
@@ -77,7 +78,7 @@ module Trooper
       action = Arsenal.actions[name]
 
       if action
-        commands = action.execute config
+        commands = action.call config
         Trooper.logger.action action.description
         runner_execute!(runner, commands)
       end

data/lib/trooper/version.rb

@@ -3,7 +3,7 @@ module Trooper
     MAJOR = 0
     MINOR = 6
     TINY  = 0
-    PRE   = 'alpha1'
+    PRE   = 'alpha2'
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trooper
 version: !ruby/object:Gem::Version
-  version: 0.6.0.alpha1
+  version: 0.6.0.alpha2
   prerelease: 6
 platform: ruby
 authors:
@@ -158,7 +158,8 @@ dependencies:
 description: Simple but powerful deployment
 email:
 - richard@madwire.co.uk
-executables: []
+executables:
+- trooper
 extensions: []
 extra_rdoc_files: []
 files:
@@ -189,8 +190,9 @@ files:
 - LICENSE
 - Rakefile
 - README.md
-homepage: http://www.madwire.co.uk
-licenses: []
+homepage: https://github.com/madwire/trooper
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -203,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3543094362386461389
+      hash: 987069315358731721
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: