depengine 3.0.20 → 3.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80a1e552180801be141930fb42d7ccf0b298ebde
-  data.tar.gz: 96d44887c4a629e516b268d7aa03ef496da0c7bc
+  metadata.gz: 77d8ce63b2b7d174f750afd9267e3d87ebc7dfe4
+  data.tar.gz: 2d3878eb61c21a861bd43daa060253660d2dae2c
 SHA512:
-  metadata.gz: 34787500598a6ab6d89c942ed198d1c1c68e4574138c01f6764eaa50447ee1e7cf3f38d5db5402bf38067e8c8f5fa56a479c82cbdd2a98026c86237f9c15e1d4
-  data.tar.gz: 1099a7b739b491455d94756f0727010528eb7080975ada5aa499ff5bef30157e012cf2e9252ff13f85bcfbbbcab51e6f21525469d11145d45785990de36f446c
+  metadata.gz: 506d0e6e2a449ce90e46084a3dd0578219d73b743c7d5d33b5460ae0ed3b012fdce80ce6728db110c12a5685de0b673cdf285bae9bd5b980d4e78d80b7f34ed2
+  data.tar.gz: e496cbf6a995a0b23067aab36d2653c2bc6ddbd7c282dc2a43182ef21c0ad8a843a03599d7a6b879dfa0aa6abdd66ce2fa406c89288085b943ecddc0c2904509

data/.rubocop.yml

@@ -0,0 +1,8 @@
+inherit_from: .rubocop_todo.yml
+AllCops:
+  Exclude:
+    - 'spec/demo_recipe/*+/*'
+    - 'spec/properties/**/*'
+    - 'spec/templates/**/*'
+    - 'spec/zip/**/*'
+

data/.rubocop_todo.yml

@@ -0,0 +1,52 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2014-08-05 09:15:27 +0000 using RuboCop version 0.24.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 28
+# Cop supports --auto-correct.
+Style/AndOr:
+  Enabled: false
+
+# Offense count: 2
+Style/BlockNesting:
+  Max: 4
+
+# Offense count: 5
+# Configuration parameters: CountComments.
+Style/ClassLength:
+  Max: 160
+
+# Offense count: 18
+Style/CyclomaticComplexity:
+  Max: 18
+
+# Offense count: 48
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 400
+# Configuration parameters: AllowedVariables.
+Style/GlobalVars:
+  Enabled: false
+
+# Offense count: 195
+# Configuration parameters: AllowURI.
+Style/LineLength:
+  Max: 236
+
+# Offense count: 66
+# Configuration parameters: CountComments.
+Style/MethodLength:
+  Max: 57
+
+# Offense count: 19
+# Cop supports --auto-correct.
+Style/Not:
+  Enabled: false
+
+# Offense count: 9
+Style/SelfAssignment:
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    depengine (3.0.13)
+    depengine (3.0.20)
       expect4r (~> 0.0)
       json (~> 1.4)
       log4r (~> 1.1)
@@ -15,6 +15,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.0.0)
     builder (3.2.2)
     diff-lcs (1.2.5)
     expect4r (0.0.10)
@@ -32,14 +33,19 @@ GEM
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.8.0)
+    parser (2.2.0.pre.3)
+      ast (>= 1.1, < 3.0)
+      slop (~> 3.4, >= 3.4.5)
     polyglot (0.3.4)
     pony (1.8)
       mail (>= 2.0)
+    powerpack (0.0.9)
     ptools (1.2.4)
     rack (1.5.2)
     rack-protection (1.5.3)
       rack
     radius (0.7.4)
+    rainbow (2.0.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -48,10 +54,18 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
+    rubocop (0.24.1)
+      json (>= 1.7.7, < 2)
+      parser (>= 2.2.0.pre.3, < 3.0)
+      powerpack (~> 0.0.6)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.5.1)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
+    slop (3.6.0)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
@@ -65,4 +79,5 @@ DEPENDENCIES
   depengine!
   fakefs (~> 0.5)
   rspec (~> 2.14)
+  rubocop (~> 0.24.1)
   sinatra (~> 1.4)

data/Rakefile

@@ -1,16 +1,16 @@
-desc "run depengine"
+desc 'run depengine'
 task :it do
-  sh "bundle install"
-  sh "`pwd`/bin/depengine"
+  sh 'bundle install'
+  sh '`pwd`/bin/depengine'
 end
 
-desc "Generate gem"
+desc 'Generate gem'
 task :build do
-  sh "gem build -V depengine.gemspec"
+  sh 'gem build -V depengine.gemspec'
 end
 
-desc "generates docs for the DSL"
+desc 'generates docs for the DSL'
 task :doc do
-  sh "rm -rf doc/"
-  sh "rdoc lib/depengine/dsl/*.rb"
-end
+  sh 'rm -rf doc/'
+  sh 'rdoc lib/depengine/dsl/*.rb'
+end

data/bin/cdb_crypt

@@ -7,8 +7,8 @@
 #
 
 require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
 
 require 'rubygems'
 require 'bundler/setup'

data/bin/de

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'depengine'
 require 'depengine/cli'
 

data/bin/depengine

@@ -7,8 +7,8 @@
 #
 
 require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
 
 require 'rubygems'
 require 'bundler/setup'

data/bin/spec_setup

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-puts "running apt-get to install packages:"
+puts 'running apt-get to install packages:'
 `sudo apt-get install zip postfix subversion`
 
 puts "allowing #{ENV['USER']} to SSH into localhost"
-`ssh-keygen -f #{ENV['HOME']}/.ssh/id_rsa -N "" -q` unless File.exists? ENV['HOME']+"/.ssh/id_rsa"
+`ssh-keygen -f #{ENV['HOME']}/.ssh/id_rsa -N "" -q` unless File.exist? ENV['HOME'] + '/.ssh/id_rsa'
 `cat #{ENV['HOME']}/.ssh/id_rsa.pub >> #{ENV['HOME']}/.ssh/authorized_keys`

data/depengine.gemspec

@@ -3,36 +3,37 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'depengine/version'
 
 Gem::Specification.new do |s|
-  s.name        = "depengine"
+  s.name        = 'depengine'
   s.version     = Depengine::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Team Automatisierung"]
-  s.email       = ["team-automatisierung@sinnerschrader.com"]
-  s.homepage    = "http://www.sinnerschrader.com"
-  s.summary     = %q{Depengine generator}
-  s.description = %q{Simply generates Depengine text.}
+  s.authors     = ['Team Automatisierung']
+  s.email       = ['team-automatisierung@sinnerschrader.com']
+  s.homepage    = 'http://www.sinnerschrader.com'
+  s.summary     = 'Depengine generator'
+  s.description = 'Simply generates Depengine text.'
 
-  s.required_ruby_version     = ">= 1.9.3"
+  s.required_ruby_version     = '>= 1.9.3'
 
   # See http://spin.atomicobject.com/2011/01/10/using-bundler-for-ruby-gem-development/
-  s.add_dependency "json", "~> 1.4"
-  s.add_dependency "net-ssh", '~> 2.8'
-  s.add_dependency "net-sftp", '~> 2.1'
-  s.add_dependency "net-scp", '~> 1.1'
-  s.add_dependency "log4r", '~> 1.1'
-  s.add_dependency "pony", '~> 1.8'
-  s.add_dependency "ptools", '~> 1.2'
-  s.add_dependency "radius", '~> 0.7'
-  s.add_dependency "expect4r", '~> 0.0'
+  s.add_dependency 'json', '~> 1.4'
+  s.add_dependency 'net-ssh', '~> 2.8'
+  s.add_dependency 'net-sftp', '~> 2.1'
+  s.add_dependency 'net-scp', '~> 1.1'
+  s.add_dependency 'log4r', '~> 1.1'
+  s.add_dependency 'pony', '~> 1.8'
+  s.add_dependency 'ptools', '~> 1.2'
+  s.add_dependency 'radius', '~> 0.7'
+  s.add_dependency 'expect4r', '~> 0.0'
 
-  s.add_development_dependency "rspec", "~> 2.14"
-  s.add_development_dependency "fakefs", '~> 0.5'
-  s.add_development_dependency "sinatra", '~> 1.4'
-  s.add_development_dependency "builder", '~> 3.2.0'
+  s.add_development_dependency 'rspec', '~> 2.14'
+  s.add_development_dependency 'fakefs', '~> 0.5'
+  s.add_development_dependency 'sinatra', '~> 1.4'
+  s.add_development_dependency 'builder', '~> 3.2.0'
+  s.add_development_dependency 'rubocop', '~> 0.24.1'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   s.executables   = %w(de depengine depengine.sh cdb_crypt)
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 end

data/lib/depengine/asserter/url.rb

@@ -6,12 +6,12 @@ module  Asserter
     attr_accessor :check_uri
     attr_accessor :check_response_string
 
-    def assert_url_response_of(options={})
-      Helper.validates_presence_of check_protocol, "check_protocol not set"
-      Helper.validates_presence_of check_host, "check_host not set"
-      Helper.validates_presence_of check_port, "check_port not set"
-      Helper.validates_presence_of check_uri, "check_uri not set"
-      Helper.validates_presence_of check_response_string, "check_response_string not set"
+    def assert_url_response_of(_options = {})
+      Helper.validates_presence_of check_protocol, 'check_protocol not set'
+      Helper.validates_presence_of check_host, 'check_host not set'
+      Helper.validates_presence_of check_port, 'check_port not set'
+      Helper.validates_presence_of check_uri, 'check_uri not set'
+      Helper.validates_presence_of check_response_string, 'check_response_string not set'
 
       check_url = "#{check_protocol}://#{check_host}:#{check_port}#{check_uri}"
       $log.writer.info "Checking URL = #{check_url} for \"#{check_response_string}\""
@@ -24,17 +24,16 @@ module  Asserter
         $log.writer.debug "ResponseCode: #{response.code}"
         $log.writer.debug "ResponseMessage: #{response.message}"
         $log.writer.debug "ResponseBody: #{response.body}"
-        if not response.code == '200'
+        unless response.code == '200'
           $log.writer.error "Got response code: #{response.code}"
           exit 1
         end
-        if not response.body =~ Regexp.new(check_response_string)
+        unless response.body =~ Regexp.new(check_response_string)
           $log.writer.error "Expected: #{check_response_string}"
           $log.writer.error "Got: #{response.body}"
           exit 1
         end
       end
-
     end
   end
 end

data/lib/depengine/cli.rb

@@ -1,21 +1,19 @@
 module Depengine
   module CLI
     class << self
-
-      def run(args, input = $stdin, output = $stdout, error = $stderr) #:nodoc:
-
+      def run(args, _input = $stdin, _output = $stdout, error = $stderr) #:nodoc:
         @deploy_home = '.'
         @recipe_name = 'recipe/deploy.rb'
 
-        args_size=args.size
+        args_size = args.size
 
         args.options do |o|
-          o.banner = "Usage: #{File.basename($0)} [options]"
-          o.separator ""
+          o.banner = "Usage: #{File.basename($PROGRAM_NAME)} [options]"
+          o.separator ''
           o.on('-n', '--new [some_path]', 'create a new empty recipe directory structure') do |path|
             require_relative('helper/cli_helper')
             extend CLIHelper
-            setup_new_recipe(path ||= ".")
+            setup_new_recipe(path || '.')
           end
           o.on('-h', '--deployhome [DIRNAME]', 'Home of deployments.') do |dname|
             set :deploy_home, dname
@@ -30,7 +28,7 @@ module Depengine
             set :env, ename
           end
           o.on('-t', '--maven_test_switch [SWITCH]', 'Disable mvn tests.') do |tname|
-          set :maven_test_switch, tname
+            set :maven_test_switch, tname
           end
           o.on('-v', '--version [VERSION]', 'Version.') do |vname|
             set :version, vname
@@ -38,18 +36,18 @@ module Depengine
           o.parse!
         end
         unless args_size > 2
-           error << args.options
-           return 127
-         end
+          error << args.options
+          return 127
+        end
 
-        recipe_filename   = File.join(($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home]), @recipe_name)
+        recipe_filename = File.join(($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home]), @recipe_name)
         puts "Evaluating recipe #{recipe_filename}"
         evaluate_recipe!(File.open(recipe_filename).read)
-        return 0
+        0
       end
 
       def evaluate_recipe!(recipe)
-        eval(recipe)
+        eval(recipe) # rubocop:disable Lint/Eval
       end
     end
   end

data/lib/depengine/dsl/cdb.rb

@@ -1,20 +1,19 @@
 module Deployment
   module Methods
     module CDB
-
-      def get_all_config_parameters
+      def get_all_config_parameters # rubocop:disable Style/AccessorMethodName
         # merge cdb data
         $recipe_config.merge @cdb
       end
 
       def get_cdb_parameters(version)
-        Helper.validates_presence_of version, "version parameter is missing"
+        Helper.validates_presence_of version, 'version parameter is missing'
         Helper.validates_presence_of $recipe_config['cdb_host'], \
-                                     "cdb_host parameter is missing"
+                                     'cdb_host parameter is missing'
         Helper.validates_presence_of $recipe_config['cdb_context'], \
-                                     "cdb_context parameter is missing"
+                                     'cdb_context parameter is missing'
         Helper.validates_presence_of $recipe_config[:module_name], \
-                                     "module_name parameter is missing"
+                                     'module_name parameter is missing'
 
         cdb          = Provider::CDB.new
         cdb.protocol = 'http'
@@ -22,17 +21,17 @@ module Deployment
         cdb.context  = $recipe_config['cdb_context']
         cdb.env      = $recipe_config[:env]
 
-        cdb.get_parameters(File.join( $recipe_config[:env], \
-                                  $recipe_config[:module_name] ), version)
+        cdb.get_parameters(File.join($recipe_config[:env], \
+                                     $recipe_config[:module_name]), version)
       end
 
       def set_cdb_parameter(key, value)
         Helper.validates_presence_of $recipe_config['cdb_host'], \
-                                     "cdb_host parameter is missing"
+                                     'cdb_host parameter is missing'
         Helper.validates_presence_of $recipe_config['cdb_context'], \
-                                     "cdb_context parameter is missing"
+                                     'cdb_context parameter is missing'
         Helper.validates_presence_of $recipe_config[:module_name], \
-                                     "module_name parameter is missing"
+                                     'module_name parameter is missing'
 
         cdb          = Provider::CDB.new
         cdb.protocol = 'http'
@@ -40,15 +39,15 @@ module Deployment
         cdb.context  = $recipe_config['cdb_context']
         cdb.env      = $recipe_config[:env]
 
-        cdb.set_parameter(File.join( $recipe_config[:env], \
-                                  $recipe_config[:module_name] ), key, value)
+        cdb.set_parameter(File.join($recipe_config[:env], \
+                                    $recipe_config[:module_name]), key, value)
       end
 
       def set_cdb_parameter_4_app(module_name, app_name, key, value)
         Helper.validates_presence_of $recipe_config['cdb_host'], \
-                                     "cdb_host parameter is missing"
+                                     'cdb_host parameter is missing'
         Helper.validates_presence_of $recipe_config['cdb_context'], \
-                                     "cdb_context parameter is missing"
+                                     'cdb_context parameter is missing'
 
         cdb          = Provider::CDB.new
         cdb.protocol = 'http'
@@ -56,8 +55,8 @@ module Deployment
         cdb.context  = $recipe_config['cdb_context']
         cdb.env      = $recipe_config['ENVIRONMENT']
 
-        cdb.set_parameter(File.join( module_name, app_name ), key, value)
+        cdb.set_parameter(File.join(module_name, app_name), key, value)
       end
     end
   end
-end
+end

data/lib/depengine/dsl/deployment.rb

@@ -11,50 +11,47 @@ module Deployment
   def self.deliver(&block)
     worker = Worker.new
     worker.instance_eval(&block)
-    return worker
+    worker
   end
 
   class Worker
-
     attr_accessor :cdb
 
     def initialize
       # initialize logging
-      if not $recipe_config[:log_level].nil?
+      unless $recipe_config[:log_level].nil?
         case $recipe_config[:log_level]
-          when "DEBUG"
-            $log.level('stdout_logger', Log4r::DEBUG)
-          when "INFO"
-            $log.level('stdout_logger', Log4r::INFO)
-          when "WARN"
-            $log.level('stdout_logger', Log4r::WARN)
-          when "ERROR"
-            $log.level('stdout_logger', Log4r::ERROR)
-          when "FATAL"
-            $log.level('stdout_logger', Log4r::FATAL)
+        when 'DEBUG'
+          $log.level('stdout_logger', Log4r::DEBUG)
+        when 'INFO'
+          $log.level('stdout_logger', Log4r::INFO)
+        when 'WARN'
+          $log.level('stdout_logger', Log4r::WARN)
+        when 'ERROR'
+          $log.level('stdout_logger', Log4r::ERROR)
+        when 'FATAL'
+          $log.level('stdout_logger', Log4r::FATAL)
         end
       end
-      if $recipe_config[:log_trace]
-        $log.enable_trace
-      end
+      $log.enable_trace if $recipe_config[:log_trace]
 
       load_modules!
 
       # generate hash from environemnt variables and merge
-      $recipe_config.merge! Helper.get_environemnt_variables($recipe_config['env_exceptions'] || "LS_COLORS TERMCAP")
+      $recipe_config.merge! Helper.get_environemnt_variables($recipe_config['env_exceptions'] || 'LS_COLORS TERMCAP')
 
       @version = Helper.parse_version($recipe_config[:version])
 
       # validate needed environment variables
-      Helper.validates_not_empty $recipe_config[:env], "env is not set"
-      Helper.validates_not_empty $recipe_config[:version], "version is not set"
-      Helper.validates_not_empty $recipe_config[:deploy_home], "deploy_home is not set"
+      Helper.validates_not_empty $recipe_config[:env], 'env is not set'
+      Helper.validates_not_empty $recipe_config[:version], 'version is not set'
+      Helper.validates_not_empty $recipe_config[:deploy_home], 'deploy_home is not set'
 
       if $recipe_config[:skip_cdb_setup]
         @cdb = {}
       else
-        $recipe_config['cdb_host'] ||= "filesystem"
-        $recipe_config['cdb_context'] ||= ""
+        $recipe_config['cdb_host'] ||= 'filesystem'
+        $recipe_config['cdb_context'] ||= ''
         @cdb = get_cdb_parameters(@version['cdb'])
       end
 
@@ -62,27 +59,25 @@ module Deployment
 
       # the logfile needs a correct WORKSPACE and the initial dirs
       # so we have to set it here
-      if $recipe_config[:log_file]
+      return unless $recipe_config[:log_file]
+      level = Log4r::INFO
+      $log.writer.info "Logfile level set to #{$recipe_config[:log_file_level]}"
+      case $recipe_config[:log_file_level]
+      when 'DEBUG'
+        level = Log4r::DEBUG
+      when 'INFO'
         level = Log4r::INFO
-        $log.writer.info "Logfile level set to #{$recipe_config[:log_file_level]}"
-        case $recipe_config[:log_file_level]
-          when "DEBUG"
-            level = Log4r::DEBUG
-          when "INFO"
-            level = Log4r::INFO
-          when "WARN"
-            level = Log4r::WARN
-          when "ERROR"
-            level = Log4r::ERROR
-          when "FATAL"
-            level = Log4r::FATAL
-        end
-        $log.add_outputter(Log4r::FileOutputter.new('log_file', \
-          :filename => File.join($recipe_config[:deploy_home], 'log', \
-                                 $recipe_config[:log_file])), \
-          level)
+      when 'WARN'
+        level = Log4r::WARN
+      when 'ERROR'
+        level = Log4r::ERROR
+      when 'FATAL'
+        level = Log4r::FATAL
       end
-
+      $log.add_outputter(Log4r::FileOutputter.new('log_file', \
+                                                  filename: File.join($recipe_config[:deploy_home], 'log', \
+                                                                      $recipe_config[:log_file])), \
+                         level)
     end
 
     def load_modules!
@@ -110,28 +105,25 @@ module Deployment
 
     def setup_workspace!
       if $recipe_config[:cleanup_workspace_before]
-         $log.writer.info "Remove all files from Workspace"
+        $log.writer.info 'Remove all files from Workspace'
         Helper.cleanup_workspace!($recipe_config[:deploy_home], $recipe_config[:cleanup_workspace_before])
       end
 
       Helper.init_workspace($recipe_config[:deploy_home])
 
-      if $recipe_config[:copy_to_workspace]
-        $recipe_config[:copy_to_workspace] = ["config"] unless $recipe_config[:copy_to_workspace].respond_to?(:each)
-        $recipe_config[:copy_to_workspace].each do |dir|
-          copy_to_workspace!(dir)
-        end
+      return unless $recipe_config[:copy_to_workspace]
+      $recipe_config[:copy_to_workspace] = ['config'] unless $recipe_config[:copy_to_workspace].respond_to?(:each)
+      $recipe_config[:copy_to_workspace].each do |dir|
+        copy_to_workspace!(dir)
       end
     end
 
     def copy_to_workspace!(dir)
-      Processor::copy(File.join($recipe_config[:recipe_base_dir], dir), $recipe_config[:deploy_home])
+      Processor.copy(File.join($recipe_config[:recipe_base_dir], dir), $recipe_config[:deploy_home])
     end
 
     # access configdata like this...
     # @hudson['USER']
     # $recipe_config[:application_name]
-
   end
 end
-

data/lib/depengine/dsl/dweb.rb

@@ -1,11 +1,10 @@
 module Deployment
   module Methods
     module DWEB
-
-     def send_dweb_command(command, options={})
-        Helper.validates_presence_of @cdb['staging_host'], "Staging Host not set"
-        Helper.validates_presence_of @cdb['ssh_key_file_command'], "SSH keyfile not set"
-        Helper.validates_presence_of @cdb['siteid'], "Siteid not set"
+      def send_dweb_command(command, options = {})
+        Helper.validates_presence_of @cdb['staging_host'], 'Staging Host not set'
+        Helper.validates_presence_of @cdb['ssh_key_file_command'], 'SSH keyfile not set'
+        Helper.validates_presence_of @cdb['siteid'], 'Siteid not set'
 
         publisher = ::Publisher::Dweb.new
         publisher.staging_host = @cdb['staging_host']
@@ -14,10 +13,10 @@ module Deployment
         publisher.send_command(command, options)
       end
 
-      def dweb_upload(source, target, options={})
-        Helper.validates_presence_of @cdb['staging_host'], "Staging Host not set"
-        Helper.validates_presence_of @cdb['ssh_key_file'], "SSH keyfile not set"
-        Helper.validates_presence_of @cdb['siteid'], "Siteid not set"
+      def dweb_upload(source, target, options = {})
+        Helper.validates_presence_of @cdb['staging_host'], 'Staging Host not set'
+        Helper.validates_presence_of @cdb['ssh_key_file'], 'SSH keyfile not set'
+        Helper.validates_presence_of @cdb['siteid'], 'Siteid not set'
         Helper.validates_presence_of source
         Helper.validates_presence_of target
 
@@ -33,7 +32,7 @@ module Deployment
                          File.join('/vhosts/', vhost, target), options)
       end
 
-      def dweb_link(source, symlink, options={})
+      def dweb_link(source, symlink, options = {})
         publisher = ::Publisher::Dweb.new
         publisher.staging_host = @cdb['staging_host']
         publisher.ssh_key_file = @cdb['ssh_key_file']
@@ -43,4 +42,4 @@ module Deployment
       end
     end
   end
-end
+end