dployr 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 901f079e84371186e545d8c438b618e84ff8d711
-  data.tar.gz: 4abb4a9493c968a60b52337d4a92c0fa83de4128
+  metadata.gz: 9e18de4be7a56b2227ef830bd0159a0fe9e675a9
+  data.tar.gz: b2d9e30ad637839636e952069b43768d8476db1c
 SHA512:
-  metadata.gz: f8f663dcc49d7d2cd944d9001ca96d9f75b80989add9ce2fc0c529723f656f81516cc23da40026afb2b93aeb397438163a79327b84fe45539f4f1df12f4d7f67
-  data.tar.gz: 2f946f5046e40ca1acd16410df0731276dc08a5561ccff27b166146cc1c3d3bae5c736ddfe12ecc8a8f4a9157d22072b60848ad6814689539ebc79aa72dadad0
+  metadata.gz: 5151faf23cfdc2b09998a78a78d25aaaf00123b234275fc9a903fc5d72c0b11907142c9b046e49142f3fc9ccf3ba2c0e65abaee599adf53827e0535c2c4f4dc9
+  data.tar.gz: 5fb7a5c245f56633f6759f12d22a5530ce8795b22fdc85a7ae3089de2f0fd6f07e2c82a177688a31abc13d65e634cb9bc5895265e93b4c9a3aeabfec71b8f99c

data/README.md

@@ -54,10 +54,10 @@ or a YAML file (adding the `.yml` or `.yaml` extension)
 
 Each configuration level supports the followings members:
 
-- **attributes** `Object`
-- **scripts** `Array`
+- **attributes** `Object` Custom attrbutes to apply to the current template
+- **scripts** `Array|Object`
 - **providers** `Object`
-- **authentication** `Object`
+- **authentication** `Object` (optional)
 - **extends** `String|Array` Allows to inherits the current config object from others
 
 #### Templating
@@ -132,11 +132,13 @@ default:
             instance_type: n1-standard-1
             network: liberty-gce
   scripts:
-    -
-      path: ./scripts/routes_allregions.sh
-    -
-      args: "%{name}"
-      path: ./scripts/updatedns.sh
+    pre-start:
+      -
+        path: ./scripts/routes_allregions.sh
+    start:
+      -
+        args: "%{name}"
+        path: ./scripts/updatedns.sh
 
 
 custom:
@@ -157,12 +159,13 @@ custom:
         attributes:
           instance_type: m1.large
     scripts:
-      -
-        args:
-          - "%{name}"
-          - "%{type}"
-          - "%{domain}"
-        path: ./scripts/configure.sh
+      post-start:
+        -
+          args:
+            - "%{name}"
+            - "%{type}"
+            - "%{domain}"
+          path: ./scripts/.sh
       -
         args:
           - "%{hydra}"
@@ -182,22 +185,25 @@ Usage: dployr <command> [options]
 
 Commands
 
-  up        start instances
+  start     start instances
   halt      stop instances
+  destroy   destroy instances
   status    retrieve the instances status
   test      run remote test in instances
   deploy    start, provision and test running instances
   provision instance provisioning
-  config    generate configuration in YAML format
+  config    generate configuration in YAML from Dployrfile
+  execute   run custom stages
   init      create a sample Dployrfile
 
 Options
 
-  -e, --environment ENV            environment to pass to the instances
   -n, --name NAME                  template name identifier to load
+  -f, --file PATH                  custom config file path to load
   -a, --attributes ATTRS           aditional attributes to pass to the configuration in matrix query format
-  -p, --provider                   provider to use (allow multiple values comma-separated)
-  -r, --region                     region to use (allow multiple values comma-separated)
+  -p, --provider VALUES            provider to use (allow multiple values comma-separated)
+  -r, --region REGION              region to use (allow multiple values comma-separated)
+  -v, -V, --version                version
   -h, --help                       help
 
 ```

data/lib/dployr/cli.rb

@@ -19,6 +19,7 @@ opt_parser = OptionParser.new do |opt|
   opt.separator  "    provision instance provisioning"
   opt.separator  "    config    generate configuration in YAML from Dployrfile"
   opt.separator  "    execute   run custom stages"
+  opt.separator  "    ssh       ssh into machine"
   opt.separator  "    init      create a sample Dployrfile"
   opt.separator  ""
   opt.separator  "  Options"
@@ -58,35 +59,31 @@ end
 
 opt_parser.parse!
 
-dployr = Dployr::Init.new @attributes
-dployr.load_config options[:file]     
-config = dployr.config.get_region(options[:name], options[:provider], options[:region])
-
 case command
 when "start"
-  Dployr::Commands::Start.new(config, options)
+  Dployr::Commands::Start.new options
 when "halt"
-  Dployr::Commands::Stop_Destroy.new(config, options, "halt")
+  Dployr::Commands::StopDestroy.new options, "halt"
 when "destroy"
-  Dployr::Commands::Stop_Destroy.new(config, options, "destroy")
+  Dployr::Commands::StopDestroy.new options, "destroy"
 when "status"
   puts "Command currently not available"
 when "provision"
-  Dployr::Commands::Provision_Test.new(config, options, "provision")
+  Dployr::Commands::ProvisionTest.new options, "provision"
 when "test"
-  Dployr::Commands::Provision_Test.new(config, options, "test")
+  Dployr::Commands::ProvisionTest.new options, "test"
 when "deploy"
-  Dployr::Commands::Start.new(config, options)
-  Dployr::Commands::Provision_Test.new(config, options, "provision")
-  Dployr::Commands::Provision_Test.new(config, options, "test")
+  Dployr::Commands::Start.new options
+  Dployr::Commands::ProvisionTest.new options, "provision"
+  Dployr::Commands::ProvisionTest.new options, "test"
 when "execute"
-  Dployr::Commands::Execute.new(config, options, ARGV[1..-1])
+  Dployr::Commands::Execute.new options, ARGV[1..-1]
+when "ssh"
+  Dployr::Commands::Ssh.new options
 when "config"
-  Dployr::Commands::Config.new(config, options)
+  Dployr::Commands::Config.new options
 when "init"
   Dployr::Config::Create.write_file
-when '-h', '--help', 'help'
-  # help already showed by option
 else
   puts opt_parser
 end

data/lib/dployr/commands/base.rb

@@ -0,0 +1,43 @@
+require 'logger'
+require 'dployr/init'
+require 'dployr/commands/utils'
+
+module Dployr
+  module Commands
+    class Base
+
+      include Dployr::Commands::Utils
+
+      attr_reader :options, :name, :log, :attrs, :dployr
+
+      def initialize(options)
+        @options = options
+        @name = options[:name]
+        @log = Logger.new STDOUT
+        @attrs = parse_attributes @options[:attributes]
+      end
+
+      def create
+        begin
+          @dployr = Dployr::Init.new @attrs
+          @dployr.load_config @options[:file]
+        rescue Exception => e
+          raise "Cannot load the config: #{e}"
+        end
+      end
+
+      def create_compute_client
+        begin
+          Dployr::Compute.const_get(@provider.to_sym).new @regions
+        rescue Exception => e
+          raise "Provider '#{@provider}' is not supported: #{e}"
+        end
+      end
+
+      def get_region_config(options)
+        @dployr.config.get_region options[:name], options[:provider], options[:region]
+      end
+
+    end
+  end
+end

data/lib/dployr/commands/config.rb

@@ -1,24 +1,41 @@
-require 'logger'
-require 'dployr/utils'
-require 'dployr/compute/aws'
-require 'colorize'
+require 'dployr/commands/base'
 
 module Dployr
   module Commands
-    class Config
+    class Config < Base
 
-      include Dployr::Utils
-
-      def initialize(config, options)
+      def initialize(options)
+        super options
         begin
-          puts "Options:", options.to_yaml
-          puts "\nConfig:", config.to_yaml
+          create
+          render_file
         rescue Exception => e
           @log.error e
-          Process.exit! false
+          exit 1
         end
       end
-      
+
+      def render_file
+        raise "Dployrfile was not found" if @dployr.file_path.nil?
+        raise "Configuration is missing" unless @dployr.config.exists?
+        begin
+          if @name and options[:provider] and options[:region]
+            config = get_region_config options
+          elsif @name
+            config = @dployr.config.get_config @name, @attrs
+          else
+            config = @dployr.config.get_config_all @attrs
+          end
+          unless config.nil?
+            puts config.to_yaml
+          else
+            @log.info "Missing configuration data"
+          end
+        rescue Exception => e
+          raise "Cannot generate the config: #{e}"
+        end
+      end
+
     end
   end
 end

data/lib/dployr/commands/execute.rb

@@ -1,40 +1,37 @@
-require 'logger'
-require 'dployr/utils'
+require 'dployr/commands/base'
 require 'dployr/compute/aws'
-require 'colorize'
 
 module Dployr
   module Commands
-    class Execute
+    class Execute < Base
 
-      include Dployr::Utils
-
-      def initialize(config, options, stages)
+      def initialize(options, stages)
+        super options
         begin
-          @log = Logger.new STDOUT     
+          create
+          config = get_region_config options
+
           @name = config[:attributes]["name"]
           @provider = options[:provider].upcase
           @region = options[:region]
-          @attributes = config[:attributes]
 
           puts "Connecting to #{@provider}...".yellow
-          @client = Dployr::Compute.const_get(@provider.to_sym).new(@region)
-          
+          @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
           if @ip
             puts "#{@name} found with IP #{@ip}".yellow
           else
             raise "#{@name} not found"
           end
-          
+
           stages.each do |stage|
             Dployr::Scripts::Hook.new @ip, config, stage
           end
-          
         rescue Exception => e
-          @log.error e
-          Process.exit! false
+          self.log.error e
+          exit 1
         end
       end
 

data/lib/dployr/commands/provision_test.rb

@@ -1,44 +1,40 @@
-require 'logger'
-require 'dployr/utils'
+require 'dployr/commands/base'
 require 'dployr/compute/aws'
-require 'colorize'
 
 module Dployr
   module Commands
-    class Provision_Test
+    class ProvisionTest < Base
 
-      include Dployr::Utils
-
-      def initialize(config, options, action)
+      def initialize(options, action)
+        super options
         begin
-          @log = Logger.new STDOUT     
+          create
+          config = get_region_config options
+
           @name = config[:attributes]["name"]
           @provider = options[:provider].upcase
           @region = options[:region]
-          @attributes = config[:attributes]
-          @action = action
 
           puts "Connecting to #{@provider}...".yellow
-          @client = Dployr::Compute.const_get(@provider.to_sym).new(@region)
-          
+          @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
           if @ip
             puts "#{@name} found with IP #{@ip}".yellow
           else
             raise "#{@name} not found"
           end
-          
-          Dployr::Scripts::Default_Hooks.new @ip, config, @action, self
-          
+
+          Dployr::Scripts::Default_Hooks.new @ip, config, action, self
         rescue Exception => e
           @log.error e
-          Process.exit! false
+          exit 1
         end
       end
 
       def action
-        return @ip
+        @ip
       end
     end
   end

data/lib/dployr/commands/ssh.rb

@@ -0,0 +1,40 @@
+require 'logger'
+require 'dployr/commands/base'
+require 'dployr/compute/aws'
+
+module Dployr
+  module Commands
+    class Ssh < Base
+
+      def initialize(options)
+        super options
+        begin
+          create
+          config = get_region_config options
+
+          @name = config[:attributes]["name"]
+          @provider = options[:provider].upcase
+          @region = options[:region]
+
+          puts "Connecting to #{@provider}...".yellow
+          @client = Dployr::Compute.const_get(@provider.to_sym).new @region
+
+          puts "Looking for #{@name} in #{@region}...".yellow
+          @ip = @client.get_ip @name
+          if @ip
+            puts "#{@name} found with IP #{@ip}".yellow
+          else
+            raise "#{@name} not found"
+          end
+
+          Dployr::Scripts::Ssh.new @ip, config
+
+        rescue Exception => e
+          self.log.error e
+          exit 1
+        end
+      end
+
+    end
+  end
+end

data/lib/dployr/commands/start.rb

@@ -1,46 +1,45 @@
-require 'logger'
-require 'dployr/utils'
+require 'dployr/commands/base'
 require 'dployr/compute/aws'
-require 'colorize'
+require 'dployr/compute/gce'
 
 module Dployr
   module Commands
-    class Start
+    class Start < Base
 
-      include Dployr::Utils
-
-      def initialize(config, options)
+      def initialize(options)
+        super options
         begin
-          @log = Logger.new STDOUT      
+          create
+          config = get_region_config options
+
           @name = config[:attributes]["name"]
           @provider = options[:provider].upcase
           @region = options[:region]
           @attributes = config[:attributes]
 
           puts "Connecting to #{@provider}...".yellow
-          @client = Dployr::Compute.const_get(@provider.to_sym).new(@region)
-                 
+          @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
+
           Dployr::Scripts::Default_Hooks.new @ip, config, "start", self
-         
         rescue Exception => e
           @log.error e
-          Process.exit! false
+          exit 1
         end
       end
-      
+
       def action
         if @ip
           puts "#{@name} found with IP #{@ip}".yellow
         else
-          @ip = @client.start(@attributes, @region)
+          @ip = @client.start @attributes, @region
           puts "Startded instance for #{@name} in #{@region} with IP #{@ip} succesfully".yellow
         end
-        return @ip
+        @ip
       end
-      
+
     end
   end
 end

data/lib/dployr/commands/stop_destroy.rb

@@ -1,49 +1,47 @@
-require 'logger'
-require 'dployr/utils'
+require 'dployr/commands/base'
 require 'dployr/compute/aws'
-require 'colorize'
 
 module Dployr
   module Commands
-    class Stop_Destroy
+    class StopDestroy < Base
 
-      include Dployr::Utils
-
-      def initialize(config, options, action)
+      def initialize(options, action)
+        super options
         begin
-          @log = Logger.new STDOUT     
+          create
+          config = get_region_config options
+
           @name = config[:attributes]["name"]
           @provider = options[:provider].upcase
           @region = options[:region]
           @attributes = config[:attributes]
           @action = action
-          
+
           puts "Connecting to #{@provider}...".yellow
-          @client = Dployr::Compute.const_get(@provider.to_sym).new(@region)
-          
+          @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
           if @ip
             puts "#{@name} found with IP #{@ip}".yellow
           else
             puts "#{@name} not found".yellow
           end
-              
-          Dployr::Scripts::Default_Hooks.new @ip, config, @action, self
-          
+
+          Dployr::Scripts::Default_Hooks.new @ip, config, action, self
         rescue Exception => e
           @log.error e
-          Process.exit! false
+          exit 1
         end
       end
-      
-      def action        
+
+      def action
         puts "#{@action.capitalize}ing #{@name} in #{@region}...".yellow
-        @client.send(@action.to_sym, @name) 
+        @client.send(@action.to_sym, @name)
         puts "#{@name} #{@action}ed sucesfully".yellow
-        return @ip
+        @ip
       end
-      
+
     end
   end
 end

data/lib/dployr/commands/utils.rb

@@ -0,0 +1,40 @@
+module Dployr
+  module Commands
+    module Utils
+
+      module_function
+
+      def parse_matrix(str)
+        hash = {}
+        str.split(';').each do |val|
+          val = val.split '='
+          hash[val.first.strip] = val.last.strip
+        end if str.is_a? String
+        hash
+      end
+
+      def parse_flags(str)
+        hash = {}
+        str.gsub(/\s+/, ' ').strip.split(' ').each_slice(2) do |val|
+          key = val.first
+          if val.first.is_a? String
+            key = key.gsub(/^\-+/, '').strip
+            hash[key] = (val.last or '').strip
+          end
+        end if str.is_a? String
+        hash
+      end
+
+      def parse_attributes(attributes)
+        if attributes.is_a? String
+          if attributes[0] == '-'
+            parse_flags attributes
+          else
+            parse_matrix attributes
+          end
+        end
+      end
+
+    end
+  end
+end