rdeis 0.0.14 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cf228ee970c63ef81770f956e515ecbc7ef974f
-  data.tar.gz: 0595ac9f67d7c0440af14ac8d0697acb70ffa86e
+  metadata.gz: ecd8d6226e57d39b4cc0b1b73656edeb4b7bb83b
+  data.tar.gz: 7e51c9cbde84a3fb06eea99ec20b847209f33818
 SHA512:
-  metadata.gz: d2feacfb5603b98075b4583b7b048ee48f8603ec84092b73b64989c1c7372de58bf5e1895a50b0b1103a997fb6f5ef37bfaf588b699ac9ea270b1e998d57b044
-  data.tar.gz: 164176c089980e17aa49dc55d896e8e7622bc71a386f3dff197520ff57fecdd008cdb3f8465dd0f3b4593d8837838258e42679ce214a85152d67f080d2646535
+  metadata.gz: 59fe10a00aa1455b4e20b5cdef497db7f9e0fdd1572f051be8780ef6908be70365271c4ba601b43dbc6f8f854c656d684027671e3525be9a509f87cbe413b427
+  data.tar.gz: ee6cfed6365a5e0fd16d297f27aafeddf0ae2f060309a1b61fb4bba1d62ba3153bf332c9bb585d1c81a4d665836b685635ca0c314f29ec744340306aa52a75bb

data/README.md

@@ -19,11 +19,14 @@ Mirrors the `deis` binary as closely as possible, so the base commands are:
 	- `rdeis config set`
 	- `rdeis config unset`
 	- `rdeis config list`
+	- `rdeis config import $file`
+	- `rdeis config export $file`
 - `rdeis domains`
 	- `rdeis domains add`
 	- `rdeis domains remove`	
 	- `rdeis domains list`
 - `rdeis deploy`
+- `rdeis destroy`
 - `rdeis help`
 - `rdeis scale`
 

data/lib/rdeis/base.rb

@@ -1,10 +1,11 @@
 module DEIS
   class Base
     include Thor::Shell
-    attr_accessor :verbose, :environment, :proxy, :cluster, :path, :output
+    attr_accessor :verbose, :environment, :proxy, :cluster, :path, :output, :ssh
     YES = "\u2713"
     NO = "\u274C"
 
+
     def log(cmd)
       say "[#{@proxy} #{Time.now}] #{cmd}", :black if @verbose
     end

data/lib/rdeis/config.rb

@@ -12,7 +12,7 @@ module DEIS
     end
 
     # output data using thors print_table & say
-    def list(vars)
+    def list(vars=nil, show=true)
       data = DEIS::Storage.get(@repo, @environment, @set_selector)
       # if vars have been set then we filter the config data to matching keys
       if ! vars.nil? && vars.length > 0
@@ -21,9 +21,11 @@ module DEIS
         data = data.select!{ |k,v| keys.include? (k) }
       end
 
-      self.results("#{@set_selector} for #{@repo} -> #{@environment}", "No data found" ,data, :green)
+      self.results("#{@set_selector} for #{@repo} -> #{@environment}", "No data found" ,data, :green) if ! show.nil?
       to_remove = DEIS::Storage.get(@repo, @environment, @remove_selector)
-      self.results("\n\n#{@set_selector} to be removed", nil, to_remove, :blue)
+      self.results("\n\n#{@set_selector} to be removed", nil, to_remove, :blue) if ! show.nil?
+      # return the data set
+      return data
     end
 
     # set config vars for the repo

data/lib/rdeis/deis.rb

@@ -174,5 +174,11 @@ module DEIS
       say "rdeis #{DEIS::VERSION}"
     end
 
+    desc "destroy", "Destroy the application"
+    def destroy
+      run = DEIS::Destroy.new(options)
+      run.all
+    end
+
   end
 end

data/lib/rdeis/deploy.rb

@@ -40,29 +40,34 @@ module DEIS
     end
 
     # deis config:set / unset wrapper
-    def config
-      self.setter("config")
+    def config(mode="rm,add")
+      self.setter("config", "unset", "set", mode)
     end
 
     # deis domains:add / remote wrapper
-    def domains
-      self.setter("domains", "remove", "add")
+    def domains(mode="rm,add")
+      self.setter("domains", "remove", "add", mode)
     end
 
     # generalised setter for config &
-    def setter(name="config", rm="unset", add="set")
+    def setter(name="config", rm="unset", add="set", mode="rm,add")
       output = {"#{name.upcase}" => ""}
+      if ! mode.index("rm").nil?
+        removed = DEIS::Storage.get(@repo, @environment, "removed_#{name}")
+        remove =DEIS::Parse.JSON_to_unset(removed) if removed.length > 0
+        remove_res = run("cd #{@deploy_to} && deis #{name}:#{rm} #{remove} | grep 'not found\\\|400' | wc -l").to_i if !remove.nil? && remove.length > 0
+        # remove the removal flagged data, as its now deleted
+        DEIS::Storage.removal_complete(@repo, @environment, "removed_#{name}") if remove_res == 0
+        output[" unset"] = if remove_res == 0 then DEIS::Deploy::YES else DEIS::Deploy::NO end
+      end
 
-      removed = DEIS::Storage.get(@repo, @environment, "removed_#{name}")
-      remove =DEIS::Parse.JSON_to_unset(removed) if removed.length > 0
-      remove_res = run("cd #{@deploy_to} && deis #{name}:#{rm} #{remove} | grep 'not found\\\|400' | wc -l").to_i if !remove.nil? && remove.length > 0
-      output[" unset"] = if remove_res == 0 then DEIS::Deploy::YES else DEIS::Deploy::NO end
-
-      to_add = DEIS::Storage.get(@repo, @environment, name)
-      set = DEIS::Parse.JSON_to_set(to_add) if to_add.length > 0
-      set_res = run("cd #{@deploy_to} && deis #{name}:#{add} #{set} | grep 'not found\\\|400' | wc -l").to_i if !set.nil? && set.length > 0
+      if ! mode.index("add").nil?
+        to_add = DEIS::Storage.get(@repo, @environment, name)
+        set = DEIS::Parse.JSON_to_set(to_add) if to_add.length > 0
+        set_res = run("cd #{@deploy_to} && deis #{name}:#{add} #{set} | grep 'not found\\\|400' | wc -l").to_i if !set.nil? && set.length > 0
 
-      output[" set"] = if set_res == 0 then DEIS::Deploy::YES else DEIS::Deploy::NO end
+        output[" set"] = if set_res == 0 then DEIS::Deploy::YES else DEIS::Deploy::NO end
+      end
       print_table output
       # if there were things to set, that ran, but failed, throw
       if !set.nil? && ! set_res.nil? && set_res > 0
@@ -183,7 +188,7 @@ module DEIS
       output = {"SCALE" => ""}
       if ! vars.nil? && vars.length > 0
         procs = DEIS::Parse.var_array(vars) if ! vars.nil? && vars.length > 0
-        procs.each{ |r| output[" #{r[:k]}=#{r[:v]}"] = if run("cd #{@deploy_to} 2>&1 /dev/null && deis scale #{r[:k]}=#{r[:v]} 2>&1 | grep 'done in\\\|#{r[:k]}.*up ' | wc -l").to_i == 2 then DEIS::Deploy::YES else DEIS::Deploy::NO end } if ! procs.nil? && procs.length > 0
+        procs.each{ |r| output[" #{r[:k]}=#{r[:v]}"] = if run("cd #{@deploy_to} 2>&1 /dev/null && deis scale #{r[:k]}=#{r[:v]} 2>&1 | grep 'done in' | wc -l").to_i > 0 then DEIS::Deploy::YES else DEIS::Deploy::NO end } if ! procs.nil? && procs.length > 0
       end
       print_table output
     end

data/lib/rdeis/destroy.rb

@@ -0,0 +1,58 @@
+module DEIS
+  require 'shellwords'
+  class Destroy < Storage
+    include Thor::Shell
+    attr_accessor :verbose, :environment, :proxy, :cluster, :path, :output, :options
+
+    def initialize(options)
+      @options = options
+      @repo = DEIS::Git.name
+      @verbose = options["verbose"]
+      @environment = options["environment"]
+      @cluster = options["cluster"]
+      # location data that fetch from env as well as options from thor
+      @proxy = if ! options["proxy"].nil? then options["proxy"] elsif ! ENV['RDEIS_PROXY'].nil? then ENV['RDEIS_PROXY'] else nil end
+      @base_path = if ! options["path"].nil? then options["path"] elsif ! ENV['RDEIS_PATH'].nil? then ENV['RDEIS_PATH'] else ENV['HOME'] end
+      # git data
+      @ref = DEIS::Git.ref
+      @branch = DEIS::Git.branch
+      @remote = DEIS::Git.remote
+
+      @name = @repo.gsub("_", "-")+"-"+@environment
+      @deploy_to = @base_path.to_s + "/"+ @name + "/"
+      @ssh = SSH.new({:host => @proxy, :user => nil}) if ! @proxy.nil?
+    end
+
+
+    def domains
+      dom = DEIS::Domains.new(@options)
+      list = DEIS::Parse.list_array_to_var_string_array(dom.list(nil, nil))
+      dom.unset(list) if ! list.nil? && list.length > 0 
+      # now deploy the change
+      deploy = DEIS::Deploy.new(@options)
+      deploy.domains("rm")
+    end
+
+    def scale
+      procs = []
+      DEIS::Parse.procs.each{|name| procs.push("#{name}=0") }
+      deploy = DEIS::Deploy.new(@options)
+      deploy.scale(procs) if ! procs.nil? && procs.length > 0
+    end
+
+    def remove
+      base = DEIS::Deploy.new(options)
+      base.run("deis destroy -a #{@name} --confirm=#{@name}")
+    end
+
+    # runs everyhing in order
+    def all
+      self.domains
+      self.scale
+      self.remove
+      say "Complete", :blue
+    end
+
+
+  end
+end

data/lib/rdeis/parse.rb

@@ -35,6 +35,13 @@ module DEIS
       end
     end
 
+    # takes the array of [ [k, v], [k, v] ] and converts back to string K=V
+    def self.list_array_to_var_string_array(data)
+      out = []
+      data.each{|sub| out.push("#{sub.first}"+ if !sub[1].nil? then "=#{sub[1]}" else "" end) }
+      out
+    end
+
     def self.JSON_to_set(json)
       cmd = ""
       json.each{|k,v| cmd += if v.to_s.length > 0 && v.to_s != "null" then "#{k}=\"#{v}\" " else "#{k} " end}
@@ -47,14 +54,20 @@ module DEIS
       cmd + " 2>&1"
     end
 
-    def self.first_proc
-      file = Dir.pwd+"/Procfile"
+    def self.procs
       procs = []
+      file = Dir.pwd+"/Procfile"
       if File.exists?(file)
         File.open(file, "r") {|f| f.read}.split("\n").each do |r|
           key = r.split(":").first
           procs.push(key)
         end
+      end
+      procs
+    end
+
+    def self.first_proc
+      if (procs=DEIS::Parse.procs) && ! procs.nil? && procs.length > 0
         return "#{procs.first}=1"
       end
       nil

data/lib/rdeis/storage.rb

@@ -34,6 +34,11 @@ module DEIS
       end
     end
 
+    # remove the removed flag for this key by just setting it to an empty hash
+    def self.removal_complete(repo, env, key)
+      DEIS::Storage.set(repo, env, key, {})
+    end
+
     # only handles top level, not sub levels
     def self.set(repo, env, key, value)
       current = DEIS::Storage.load(repo, env)

data/lib/rdeis/version.rb

@@ -1,4 +1,4 @@
 module DEIS
-  VERSION='0.0.14'
-  LAST_VERSION='0.0.13'
+  VERSION='0.1.0'
+  LAST_VERSION='0.0.14'
 end

data/lib/rdeis.rb

@@ -12,5 +12,6 @@ module DEIS
   require "rdeis/config"
   require "rdeis/domains"
   require "rdeis/deploy"
+  require "rdeis/destroy"
   require "rdeis/deis"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdeis
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.1.0
 platform: ruby
 authors:
 - Charles Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - lib/rdeis/config.rb
 - lib/rdeis/deis.rb
 - lib/rdeis/deploy.rb
+- lib/rdeis/destroy.rb
 - lib/rdeis/domains.rb
 - lib/rdeis/git.rb
 - lib/rdeis/parse.rb
@@ -79,7 +80,7 @@ files:
 - lib/rdeis/version.rb
 - lib/ssh.rb
 - rdeis.gemspec
-homepage: https://github.com/charlesmarshall/deis_deploy/tree/0.0.14
+homepage: https://github.com/charlesmarshall/deis_deploy/tree/0.1.0
 licenses:
 - MIT
 metadata: {}