dployr 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55e8744de1ada22c752a30e73a533774383b957a
-  data.tar.gz: 71bd763bd9e8de49200a57c9622f6c142de98aec
+  metadata.gz: 3cb69bcafe1f40f150073a9ceedd816ab18edbe6
+  data.tar.gz: 986eee01920f5d35961069fa0d250d24d8685182
 SHA512:
-  metadata.gz: 59247fbc73d154f5d8535adbc1e20584be2e5e243764260e033482f09b12f73f29513b7f2887f7676d5bd1706a733237c9257aed82533f5cf22aa4db00c4f1fc
-  data.tar.gz: 964b34cf57543d3db61b460147d920b539ac7e40202dd5194488354fd21e8f3d29842d1038910b4602bbe0e719fe71a1767265a6f00d7fcc92839e798c5721c6
+  metadata.gz: b2874793ccd7fd16b02f20fcc40ed355b3ef77b3190c7a2760619c27fe64ef00e7639eb23dc1bebf542afcc12e50936359627638d2931e22bafcf51b5ac52101
+  data.tar.gz: 8e0275679ba5c03b65b2b4ff29adcd304bc4cb0cf20634f0fbcb5415ab14f907adfbbed2e6013acb9ce793084f4439b2af95d4940431ed0cc87d57c5ef13245b

data/lib/dployr/cli.rb

@@ -14,6 +14,7 @@ opt_parser = OptionParser.new do |opt|
   opt.separator  "    halt      stop instances"
   opt.separator  "    destroy   destroy instances"
   opt.separator  "    status    retrieve the instances status"
+  opt.separator  "    info      retrieve instance information and output it in YAML format"
   opt.separator  "    test      run remote test in instances"
   opt.separator  "    deploy    start, provision and test running instances"
   opt.separator  "    provision instance provisioning"
@@ -44,6 +45,10 @@ opt_parser = OptionParser.new do |opt|
   opt.on("-r", "--region REGION", "region to use (allow multiple values comma-separated)") do |v|
     options[:region] = v
   end
+  
+  opt.on("-i", "--public-ip", "use public ip instead of private ip to when access instances") do |v|
+    options[:public_ip] = v
+  end
 
   opt.on("-v",  "-V", "--version", "version") do
     puts Dployr::VERSION
@@ -69,6 +74,8 @@ when "destroy"
   Dployr::Commands::StopDestroy.new options, "destroy"
 when "status"
   puts "Command currently not available"
+when "info"
+  Dployr::Commands::Info.new options
 when "provision"
   Dployr::Commands::ProvisionTest.new options, "provision"
 when "test"

data/lib/dployr/commands/config.rb

@@ -38,6 +38,7 @@ module Dployr
           config = @dployr.config.get_config_all @attrs
         end
         unless config.nil?
+          puts @options.to_yaml
           puts config.to_yaml
         else
           raise "Missing configuration data"

data/lib/dployr/commands/execute.rb

@@ -19,7 +19,7 @@ module Dployr
           @client = Dployr::Compute.const_get(@provider.to_sym).new @region
 
           puts "Looking for #{@name} in #{@region}...".yellow
-          @ip = @client.get_ip @name
+          @ip = @client.get_ip(@name, options[:public_ip])
           if @ip
             puts "#{@name} found with IP #{@ip}".yellow
           else

data/lib/dployr/commands/info.rb

@@ -0,0 +1,35 @@
+require 'dployr/commands/base'
+require 'dployr/compute/aws'
+
+module Dployr
+  module Commands
+    class Info < Base
+
+      def initialize(options)
+        super options
+        begin
+          create
+          config = get_region_config options
+
+          @name = config[:attributes]["name"]
+          @provider = options[:provider].upcase
+          @region = options[:region]
+
+          @client = Dployr::Compute.const_get(@provider.to_sym).new @region
+
+          @info = @client.get_info @name
+          if @info
+            puts @info.to_yaml
+          else
+            raise "#{@name} not found"
+          end
+          
+        rescue Exception => e
+          self.log.error e
+          exit 1
+        end
+      end
+
+    end
+  end
+end

data/lib/dployr/commands/provision_test.rb

@@ -19,7 +19,7 @@ module Dployr
           @client = Dployr::Compute.const_get(@provider.to_sym).new @region
 
           puts "Looking for #{@name} in #{@region}...".yellow
-          @ip = @client.get_ip @name
+          @ip = @client.get_ip(@name, options[:public_ip])
           if @ip
             puts "#{@name} found with IP #{@ip}".yellow
           else

data/lib/dployr/commands/ssh.rb

@@ -20,7 +20,7 @@ module Dployr
           @client = Dployr::Compute.const_get(@provider.to_sym).new @region
 
           puts "Looking for #{@name} in #{@region}...".yellow
-          @ip = @client.get_ip @name
+          @ip = @client.get_ip(@name, options[:public_ip])
           if @ip
             puts "#{@name} found with IP #{@ip}".yellow
           else

data/lib/dployr/commands/start.rb

@@ -21,7 +21,7 @@ module Dployr
           @client = Dployr::Compute.const_get(@provider.to_sym).new @region
 
           puts "Looking for #{@name} in #{@region}...".yellow
-          @ip = @client.get_ip @name
+          @ip = @client.get_ip(@name, options[:public_ip])
 
           Dployr::Scripts::Default_Hooks.new @ip, config, "start", self
         rescue Exception => e

data/lib/dployr/commands/stop_destroy.rb

@@ -21,7 +21,7 @@ module Dployr
           @client = Dployr::Compute.const_get(@provider.to_sym).new @region
 
           puts "Looking for #{@name} in #{@region}...".yellow
-          @ip = @client.get_ip @name
+          @ip = @client.get_ip(@name, options[:public_ip])
           if @ip
             puts "#{@name} found with IP #{@ip}".yellow
           else

data/lib/dployr/compute/aws.rb

@@ -17,9 +17,19 @@ module Dployr
         @compute = Fog::Compute.new @options
       end
 
-      def get_ip(name)
-        instance = get_instance(name, ["running"])
-        instance.private_ip_address if instance
+      def get_ip(name, public)
+        instance = get_instance(name, ["running"]) # TODO: add starting states
+        if instance
+          if public
+            return instance.public_ip_address
+          else
+            return instance.private_ip_address
+          end
+        end
+      end
+      
+      def get_info(name)
+        get_instance(name, ["running", "stopped", "stopping"])
       end
 
       def destroy(name)

data/lib/dployr/compute/gce.rb

@@ -29,12 +29,20 @@ module Dployr
           return nil
         end
 
-        def get_ip(name)
+        def get_ip(name, public)
           instance = get_instance(name, ["PROVISIONING", "STAGING", "RUNNING"])
           if instance
-            return instance.private_ip_address
+            if public
+              return instance.public_ip_address
+            else
+              return instance.private_ip_address
+            end
           end
         end
+        
+        def get_info(name)
+          get_instance(name,["RUNNING", "STOPPED"])
+        end
 
         def destroy(name)
           instance = get_instance(name, ["RUNNING", "STOPPED"])
@@ -88,7 +96,7 @@ module Dployr
 
         def start(attributes, region)
           external_ip(attributes, region)
-          server = get_instance(attributes["name"], ["stopped", "stopping"])
+          server = get_instance(attributes["name"], ["STOPPED"])
           if server
             puts "Starting stopped instance for #{attributes["name"]} in #{region}...".yellow
             server.start

data/lib/dployr/scripts/default_hooks.rb

@@ -15,7 +15,7 @@ module Dployr
           Dployr::Scripts::Hook.new @ip, config, "#{@stage}"
         end
         if @config[:scripts]["post-#{@stage}"]
-          Dployr::Scripts::Hook.new @ip, config, "#{@stage}"
+          Dployr::Scripts::Hook.new @ip, config, "post-#{@stage}"
         end
       end
 

data/lib/dployr/scripts/local_shell.rb

@@ -16,9 +16,13 @@ module Dployr
         arguments = @script["args"]
 
         puts "Running local script '#{command} #{arguments}'".yellow
-        result = system(command + ' ' + arguments)
+        total_command = command
+          if arguments
+            total_command =  command + ' ' + arguments
+          end
+        result = system(total_command)
         if result == false
-          raise "Exit code non zero when running local script '#{command} #{arguments}'".yellow
+          raise "Exit code non zero when running local script '#{total_command}'".yellow
         else
           puts "Local script '#{command} #{arguments}' finished succesfully".yellow
         end

data/lib/dployr/scripts/scp.rb

@@ -10,7 +10,7 @@ module Dployr
           Net::SCP.start(ip, username, :keys => [private_key_path]) do |scp|
             source = script["source"]
             target = script["target"]
-            puts "Coping #{source} -> #{target}".yellow
+            puts "Copying #{source} -> #{target}".yellow
             scp.upload(source, target, :recursive => true, :preserve => true)
           end
         rescue Exception => e

data/lib/dployr/scripts/shell.rb

@@ -22,9 +22,13 @@ module Dployr
           arguments = @script["args"]
 
           puts "Running remote script '#{command} #{arguments}'".yellow
-          result = ssh_exec!(ssh, command + ' ' + arguments)
+          total_command = command
+          if arguments
+            total_command =  command + ' ' + arguments
+          end
+          result = ssh_exec!(ssh, total_command)
           if result[:exit_code] > 0
-            raise "Exit code #{result[:exit_code]} when running script '#{command} #{arguments}'".yellow
+            raise "Exit code #{result[:exit_code]} when running script '#{total_command}'".yellow
           else
             puts "Remote script '#{command} #{arguments}' finished succesfully".yellow
           end

data/lib/dployr/version.rb

@@ -1,3 +1,3 @@
 module Dployr
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/dployr.rb

@@ -6,6 +6,7 @@ require 'dployr/config/create'
 require 'dployr/config/file_utils'
 require 'dployr/config/instance'
 require 'dployr/commands/provision_test'
+require 'dployr/commands/info'
 require 'dployr/commands/start'
 require 'dployr/commands/stop_destroy'
 require 'dployr/commands/config'

data/spec/fixtures/german/Dployrfile.yml

@@ -9,8 +9,10 @@ german-template:
       - source: ./hello
         target: /tmp
     provision:
-      - remote_path: /tmp/hello/jetty.sh
-        args: ""
+      - remote_path: /tmp/hello/hello.sh
+    post-halt:
+      - local_path: sleep
+        args: "50"
   providers:
     aws:
       attributes:

data/spec/fixtures/german/real_test.rb

@@ -0,0 +1,16 @@
+#OPTIONS=" -f Dployrfile.yml -n german-template -p aws -r sa-east-1a"
+OPTIONS=" -f Dployrfile.yml -n german-template -p gce -r europe-west1-a"
+
+
+BIN="../../../bin/dployr"
+COMMANDS = ["start", "provision", "halt", "start", "execute pre-provision", "destroy"]
+
+COMMANDS.each do |cmd|
+  to_run = "#{BIN} #{cmd} #{OPTIONS}"
+  puts to_run
+  result = system(to_run)
+  if result == false
+    raise "ERROR"
+  end
+  puts "\n\n"
+end