dragon 0.1.1 → 0.1.2

data/lib/dragon/command_runner.rb

@@ -6,12 +6,14 @@ module Dragon
       end
 
       def run commands
-         commands.each{|k,v|
-            puts "runnning: #{ k } #{ v }"
-            unless v.empty?
-               ran = @boxes.send( k.to_sym, v )
+         commands.each{|c,i|
+            name = c.keys[0]
+            args = c[name]
+            puts "runnning: #{ name } #{ args }"
+            unless args.empty?
+               ran = @boxes.send( name.to_sym, args )
             else
-               ran = @boxes.send( k.to_sym )
+               ran = @boxes.send( name.to_sym )
             end
             puts "     output: #{ ran.stdout }" if ran.respond_to? :stdout
          }

data/lib/dragon/deploy.rb

@@ -10,15 +10,15 @@ module Dragon
       def default_commands sequence
          return {} if @options.local_settings.has_key?( "commands_run_default" )
          {
-            use_git: {
-               git: "clone --depth=1 --branch=#{ @options.environment } #{ @options.local_settings["git_url"] } #{ @options.release }",
-            },
-            local_upload: {
+            use_git: [{
+               git: "clone --depth=1 --branch=#{ @options.local_settings["git_branch"] } #{ @options.local_settings["git_url"] } #{ @options.release_dir }",
+            }],
+            local_upload: [{
                dir_upload: "#{ @options.local_settings["local_upload_dir"] }",
-            },
-            current_linking: {
+            }],
+            current_linking: [{
                ln: "-nfs #{ @options.release_dir } #{ @options.local_settings["destination_symlink"] }",
-            }
+            }]
          }[sequence]
       end
 

data/lib/dragon/options.rb

@@ -37,9 +37,9 @@ module Dragon
 
     def update_commands
       return nil unless !@local_settings.nil? && @local_settings.has_key?( "commands" )
-      @local_settings['commands'].each{|k,v|
-        rendered_value = Liquid::Template.parse( v ).render( command_liquid_args )
-        @local_settings['commands'][k] = rendered_value
+      @local_settings['commands'].each_with_index{|command,i|
+        rendered_value = Liquid::Template.parse( @local_settings['commands'][ i ][ command.keys[0] ] ).render( command_liquid_args )
+        @local_settings['commands'][ i ][ command.keys[0] ] = rendered_value
       }
     end
 

data/lib/dragon/server_set.rb

@@ -6,10 +6,13 @@ module Dragon
       attr_reader :set
 
       def initialize(options)
+         add_commands # making sure added commads are set befor server set is created
          @options = options
          @set = server_set
       end
 
+   private
+
       def server_set
         set = Rye::Set.new
         @options.local_settings['servers'].each{ |s|
@@ -19,7 +22,12 @@ module Dragon
       end
 
       def server str
-         Rye::Box.new( str, { keys: [ @options.local_settings['servers_key_location'] ], user: @options.local_settings['servers_username'] } )
+         Rye::Box.new( str, { keys: [ @options.local_settings['servers_key_location'] ], user: @options.local_settings['servers_username'], safe: false } )
+      end
+
+      # custom commands
+      def add_commands
+        Rye::Cmd.add_command :rm
       end
 
    end

data/lib/dragon/version.rb

@@ -1,3 +1,3 @@
 module Dragon
-   VERSION="0.1.1"
+   VERSION="0.1.2"
 end

data/resources/templates/dragfile.yaml.erb

@@ -14,9 +14,9 @@ default: &default
    # uncomment this setting if you do not want the default commands to run
    # commands_run_default: no
    commands:
-      cd: "{{release_dir}}/ && pwd"
-      rm: "-rf {{release_dir}}/log"
-      ls: "-nfs {{destination_root}}/shared/log {{release_dir}}"
+      - cd: "{{release_dir}}/ && pwd"
+      - rm: "-rf {{release_dir}}/log"
+      - ls: "-nfs {{destination_root}}/shared/log {{release_dir}}"
 
 staging:
    <<: *default

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dragon
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler