avodeploy 0.4.2 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9eb2622171b0f1c3e6a7aa3fd51eefc83d78081f
-  data.tar.gz: 55218f0f1f3280d66e6f948d9b63b85e2a094512
+  metadata.gz: c5a1b04cd17393f6c97bf4de8b47b6d9c1f6917c
+  data.tar.gz: 8b63dc83eab4cea72b00b4a874d6e809ff79066b
 SHA512:
-  metadata.gz: 1b5eda736217651f0407572840b49ffac53efb969681dfca8b56e52035f1b07e30b459f72af25325bc7949dd039231cd0feaf16fdb598844c4e42cdbc6cea747
-  data.tar.gz: 82394f84a81e5798e76d799d739e8d494b17b85eb7e34c8278e1aa395a55d22e91f9b5ec8cae3f34f0329b5bcdcc8173785a2c75810032fb54f08f74948ccc41
+  metadata.gz: ac202f5b23a6709f2e3957947307a15757d784d2a7a8e4778c6dbfc02741a353c9165197076026085359f0003414c0e451dab699c6b2a419513a1a964a504003
+  data.tar.gz: 27e865de96259b7b52900effd25b5b3a40e7a65a3bca10a41a96b3a45b4fdaab312905aaa185b87824581ab52cc4f440333516aa64cac298d6906d64a2f077fb

data/CHANGELOG

@@ -1,3 +1,23 @@
+0.5
+
+* avo cli command is now verbose by default
+* Optimized various log levels
+* SSH connections time out after 30 seconds
+* Bugfix: tar exclude now uses regular expressions, matching only strict definitions
+* Configuration option `force_tag` allows to enforce tag deployments (#20)
+* The `-t` / `--tag` parameter allows deployment of tags (#17)
+* Configuration option `setup_stage` now uses symbols for names by default (#15)
+* `avo -v` does not longer show debug output (#16)
+* Target configuration option `port` allows usage of non-standard ssh ports (#19)
+* Ignored files are not longer deleted, but excluded while creating the deployment archive
+* Bzr SCM-Provider implemented
+* Tasks can now call other tasks using `run` or `run_nodeps`
+* Implemented `only` and `except` condition for remote hosts
+* Code reformatted, Tabs to spaces
+* Added requirement for Ruby >= 2.0 in the gemspec file
+* `local_copy_partial` strategy implemented. Just uploads files, that have changes since the last deployment + untracked files
+* `inherit_strategy` implemented, allows to extend existing strategies
+
 0.4.2
 * Bugfix: Avocado cannot resolve defined stages
 

data/README.md

@@ -3,7 +3,7 @@ develop: ![](https://travis-ci.org/dprandzioch/avocado.svg?branch=develop) | mas
 ### Avocado
 Avocado is a deployment framework for web applications written in Ruby.
 
-The current release is 0.4.2.
+The current release is 0.5.
 
 ### Licensing
 Avocado is licensed under the GPLv2. For more Information have a look into the LICENSE file.

data/avodeploy.gemspec

@@ -4,25 +4,27 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'avodeploy/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "avodeploy"
+  spec.name          = 'avodeploy'
   spec.version       = AvoDeploy::VERSION
-  spec.authors       = ["David Prandzioch"]
-  spec.email         = ["dprandzioch@me.com"]
+  spec.authors       = ['David Prandzioch']
+  spec.email         = ['kontakt@davidprandzioch.de']
   spec.summary       = %q{Avocado is a flexible deployment framework for web applications.}
-  spec.description   = ""
-  spec.homepage      = "http://dprandzioch.github.io/avocado/"
-  spec.license       = "GPLv2"
+  spec.description   = ''
+  spec.homepage      = 'http://dprandzioch.github.io/avocado/'
+  spec.license       = 'GPLv2'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = ["avo"]
+  spec.executables   = ['avo']
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency "terminal-table", "~> 1.4.5"
-  spec.add_dependency "net-ssh", "~> 2.9.1"
-  spec.add_dependency "net-scp", "~> 1.2.1"
-  spec.add_dependency "thor", "~> 0.19.1"
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.0'
+
+  spec.add_dependency 'terminal-table', '~> 1.4.5'
+  spec.add_dependency 'net-ssh', '~> 2.9.1'
+  spec.add_dependency 'net-scp', '~> 1.2.1'
+  spec.add_dependency 'thor', '~> 0.19.1'
 end

data/bin/avo

@@ -25,110 +25,107 @@ require File.join(File.dirname(THIS_FILE), '../lib/avodeploy.rb')
 
 class AvocadoCli < Thor
 
-	package_name "Avocado"
-
-	class_option :verbose, :type => :boolean, :aliases => :v
-	class_option :debug, :type => :boolean, :aliases => :d
-
-	desc "start [STAGE] [TASK]", "Start a task in the specified stage"
-	method_options :stage => :string, :task => :string
-	option :nodeps, :type => :boolean, :aliases => :n
-	long_desc <<-LONGDESC
-		`avo start` will execute a chain of tasks specified in either the deployment strategy
-		or the deployment manifest (Avofile). Instead of invoking the chain with its name
-		just use the actual task you want to execute and Avocado will take care of executing the
-		right task chain for your needs.
-	LONGDESC
-	def start(stage, task)
-		instance = AvoDeploy::Bootstrap.run(stage, options[:verbose], options[:debug])
-		
-		if options[:nodeps]
-			instance.task_manager.invoke_task_oneshot(task)
-		else
-			instance.task_manager.invoke_task_chain_containing(task)
-		end
-	end
-
-	desc 'task [NAME] [--stage="[STAGE]"]', "Show more information about a specific task"
-	method_options :name => :string
-	option :stage, :type => :string, :aliases => :s
-	def task(name)
-		if options[:stage].nil? == false
-			stage = options[:stage]
-		else
-			stage = :default
-		end
-
-		instance = AvoDeploy::Bootstrap.run(stage, options[:verbose], options[:debug])
-		task = instance.task_manager.task_by_name(name)
-
-		puts Terminal::Table.new :title => 'Task overview', :rows => [
-				['Name', task.name],
-				['Description', task.desc],
-				['Scope', task.scope],
-				['Visibility', task.visibility],
-			]
-	end
-
-	desc "chains [STAGE]", "List all chains for the current stage"
-	method_options :stage => :string
-	def chains(stage)
-		instance = AvoDeploy::Bootstrap.run(stage, options[:verbose], options[:debug])
-		
-		instance.task_manager.chains.each do |chain|
-			rows = []
-
-			chain.each_pair do |key, task|
-				if task.visibility = :public
-					rows << [
-						task.name,
-						task.scope,
-						task.desc
-					]
-				end
-			end
-
-			puts Terminal::Table.new :title => "Chain overview", 
-									 :headings => ['Title', 'Scope', 'Description'], 
-									 :rows => rows
-		end
-	end
-
-	desc "stages", "List all stages"
-	def stages
-		instance = AvoDeploy::Bootstrap.run(:default, options[:verbose], options[:debug])
-
-		puts Terminal::Table.new :title => "Stages list", 
-								 :headings => ['Title', 'Description'], 
-								 :rows => instance.config.stages
-	end
-
-	desc "install [--stages=staging,qa,production]", "Creates a Avofile in your project directory"
-	option :stages, :type => :string
-	def install
-		if File.exist?(Dir.pwd.concat('/Avofile'))
-			puts 'The Avofile does already exist. No need to create a new one.'
-			Kernel.exit(true)
-		end
-
-		stages = [ 'staging', 'production' ]
-
-		if options[:stages].nil? == false
-			stages = options[:stages].split(',')
-		end
-
-		data = {
-			:stages => stages,
-		}
-
-		require 'erb'
-		renderer = ERB.new(File.new(File.dirname(THIS_FILE) + '/../lib/avodeploy/skel/manifest_template.rb.erb').read)
-		output = renderer.result(binding)
-
-		File.write(Dir.pwd.concat('/Avofile'), output)
-
-		puts 'The deployment manifest file called `Avofile` has been created in the current directory.'
-	end
+    package_name 'Avocado'
+
+    class_option :verbose, :type => :boolean, :aliases => :v, :default => true
+    class_option :debug, :type => :boolean, :aliases => :d
+
+    desc 'start [STAGE] [TASK]', 'Start a task in the specified stage'
+    method_options :stage => :string, :task => :string
+    option :nodeps, :type => :boolean, :aliases => :n
+    option :tag, :type => :string, :aliases => :t
+    long_desc <<-LONGDESC
+        `avo start` will execute a chain of tasks specified in either the deployment strategy
+        or the deployment manifest (Avofile). Instead of invoking the chain with its name
+        just use the actual task you want to execute and Avocado will take care of executing the
+        right task chain for your needs.
+    LONGDESC
+    def start(stage, task)
+        instance = AvoDeploy::Bootstrap.run(stage, options[:verbose], options[:debug])
+        
+        if options[:nodeps]
+            instance.task_manager.invoke_task_oneshot(task, options)
+        else
+            instance.task_manager.invoke_task_chain_containing(task, options)
+        end
+    end
+
+    desc 'task [NAME] [--stage="[STAGE]"]', 'Show more information about a specific task'
+    method_options :name => :string
+    option :stage, :type => :string, :aliases => :s
+    def task(name)
+        if options[:stage].nil? == false
+            stage = options[:stage]
+        else
+            stage = :default
+        end
+
+        instance = AvoDeploy::Bootstrap.run(stage, options[:verbose], options[:debug])
+        task = instance.task_manager.task_by_name(name)
+
+        puts Terminal::Table.new :title => 'Task overview', :rows => [
+                ['Name', task.name],
+                ['Description', task.desc],
+                ['Scope', task.scope],
+                ['Visibility', task.visibility],
+            ]
+    end
+
+    desc 'chains [STAGE]', 'List all chains for the current stage'
+    method_options :stage => :string
+    def chains(stage)
+        instance = AvoDeploy::Bootstrap.run(stage, options[:verbose], options[:debug])
+        
+        instance.task_manager.chains.each do |chain|
+            rows = []
+
+            chain.each_pair do |key, task|
+                if task.visibility = :public
+                    rows << [
+                        task.name,
+                        task.scope,
+                        task.desc
+                    ]
+                end
+            end
+
+            puts Terminal::Table.new :title => 'Chain overview',
+                                     :headings => ['Title', 'Scope', 'Description'], 
+                                     :rows => rows
+        end
+    end
+
+    desc 'stages', 'List all configured stages'
+    def stages
+        instance = AvoDeploy::Bootstrap.run(:default, options[:verbose], options[:debug])
+
+        puts Terminal::Table.new :title => "Stages list", 
+                                 :headings => ['Title', 'Description'], 
+                                 :rows => instance.config.stages
+    end
+
+    desc 'install [--stages=staging,qa,production]', 'Creates a Avofile in your project directory'
+    option :stages, :type => :string
+    def install
+        if File.exist?(Dir.pwd.concat('/Avofile'))
+            puts 'The Avofile does already exist. No need to create a new one.'
+            Kernel.exit(true)
+        end
+
+        stages = %w(staging production)
+
+        if options[:stages].nil? == false
+            stages = options[:stages].split(',')
+        end
+
+        require 'erb'
+        renderer = ERB.new(File.new(File.dirname(THIS_FILE) + '/../lib/avodeploy/skel/manifest_template.rb.erb').read)
+        output = renderer.result(binding)
+
+        File.write(Dir.pwd.concat('/Avofile'), output)
+
+        puts 'The deployment manifest file called `Avofile` has been created in the current directory.'
+    end
 
 end
 

data/lib/avodeploy.rb

@@ -15,6 +15,7 @@ require 'avodeploy/task/remote_task_execution_environment.rb'
 
 require 'avodeploy/scm_provider/scm_provider.rb'
 require 'avodeploy/scm_provider/git_scm_provider.rb'
+require 'avodeploy/scm_provider/bzr_scm_provider.rb'
 
 require 'avodeploy/multi_io.rb'
 require 'avodeploy/command_execution_result.rb'

data/lib/avodeploy/bootstrap.rb

@@ -17,77 +17,69 @@
 =end
 
 module AvoDeploy
-	class Bootstrap
-		# Runs the avocado bootstrap
-		#
-		# @param stage [Symbol] the stage to bootstrap
-		# @param verbose [Boolean] run in verbose mode
-		# @param debug [Boolean] run in boolean mode
-		def self.run(stage = :default, verbose = false, debug = false)
-			if stage.is_a?(String)
-				stage = stage.to_sym
-			end
-
-			begin
-				# defaults
-				AvoDeploy::Deployment.configure do
-					set :stage, stage
-
-					setup_stage :default do
-						# a default stage is needed for some use cases,
-						# especially if you don't know which stages were defined by the user
-					end
-				end
-
-				if File.exist?(Dir.pwd.concat('/Avofile')) == false
-					raise RuntimeError, 'Could not find Avofile. Run `avo install` first.'
-				end
-
-				instance = AvoDeploy::Deployment.instance
-
-				# load user config initially to determine strategy
-				begin
-					load File.join(Dir.pwd, 'Avofile')
-				rescue RuntimeError => e
-					# `find_chain_index_containing': could not find a chain containing task create_deployment_tarball (RuntimeError)
-					# error not neccessary because dependencies are not loaded
-				end
-
-				if debug
-					instance.log.level = Logger::DEBUG
-				elsif verbose
-					instance.log.level = Logger::INFO
-				else
-					instance.log.level = instance.config.get(:log_level)
-				end
-
-				instance.log.debug "Loading deployment strategy #{instance.config.get(:strategy).to_s}..."
-
-				# load strategy
-				# @todo check
-				require "avodeploy/strategy/base.rb"
-				require "avodeploy/strategy/#{instance.config.get(:strategy).to_s}.rb"
-
-				instance.log.debug "Loading user configuration..."
-
-				# override again by user config to allow manipulation of tasks
-				load File.join(Dir.pwd, 'Avofile')
-
-				# requested stage was not found
-				if instance.config.loaded_stage.nil?
-					raise ArgumentError, 'The requested stage does not exist.'
-				end
-			rescue Exception => e
-				if debug
-					raise e
-				else 
-					AvoDeploy::Deployment.instance.log.error e.message.red
-				end
-
-				Kernel.exit(true)
-			end
-
-			AvoDeploy::Deployment.instance
-		end
-	end
+  class Bootstrap
+    # Runs the avocado bootstrap
+    #
+    # @param stage [Symbol] the stage to bootstrap
+    # @param verbose [Boolean] run in verbose mode
+    # @param debug [Boolean] run in boolean mode
+    def self.run(stage = :default, verbose = false, debug = false)
+      if stage.is_a?(String)
+        stage = stage.to_sym
+      end
+
+      begin
+        # defaults
+        AvoDeploy::Deployment.configure do
+          set :stage, stage
+
+          setup_stage :default do
+            # a default stage is needed for some use cases,
+            # especially if you don't know which stages were defined by the user
+          end
+        end
+
+        if File.exist?(Dir.pwd.concat('/Avofile')) == false
+          raise RuntimeError, 'Could not find Avofile. Run `avo install` first.'
+        end
+
+        instance = AvoDeploy::Deployment.instance
+
+        if debug
+          instance.log.level = Logger::DEBUG
+        elsif verbose
+          instance.log.level = Logger::INFO
+        else
+          instance.log.level = instance.config.get(:log_level)
+        end
+
+        # load user config initially to determine strategy
+        begin
+          load File.join(Dir.pwd, 'Avofile')
+        rescue RuntimeError => e
+          # `find_chain_index_containing': could not find a chain containing task create_deployment_tarball (RuntimeError)
+          # error not neccessary because dependencies are not loaded
+        end
+
+        instance.log.debug 'Loading user configuration...'
+        # override again by user config to allow manipulation of tasks
+        load File.join(Dir.pwd, 'Avofile')
+
+        # requested stage was not found
+        if instance.config.loaded_stage.nil?
+          raise ArgumentError, 'The requested stage does not exist.'
+        end
+      rescue Exception => e
+        #if debug
+          raise e
+        #else
+        #  AvoDeploy::Deployment.instance.log.error e.message.red
+        #end
+
+        Kernel.exit(true)
+      end
+
+      AvoDeploy::Deployment.instance
+    end
+  end
 end