rdeis 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9387bf448349d59690236456bc8abe5637581e5
-  data.tar.gz: a9070c49d860c263eeee49c2bb9eea315e04f034
+  metadata.gz: 3eb09348d27697c9f046a8c1df44fe060bd2faee
+  data.tar.gz: 8b0511dcba674211a21020849d817a23449631a5
 SHA512:
-  metadata.gz: f47f55d18685df21039af34441933cc266e61cb7cdaa9f63da02836e41c0a48054e50cc411d6597a3c8abb1037e9e89d0c04d12ecbbce47a0cc113f28bf11c9b
-  data.tar.gz: 4ee81aed9fdf1e8df47d3c48c67195d417e2195848e7cab3770f03df74a2a155c54f9d404252bd84e698701d7c2c278022c2ec03a5faa5120296b325dff12d20
+  metadata.gz: ba213ddedc11df0158e607804df8d6b3b15a47cd24ee348179fef4d7eb9f05bed67f05a85f572cdc6e2e1f5831458f380cd1cfff178c6830e1c160d7ba8eca40
+  data.tar.gz: 0f2d49c55dcdde867af08739ff5213eb60a92d8a783f0895f16cc81be9af32e99e159d71502b30ab26d89d11bc73ed0da7c137fa18e457e0d8d3d48f2842b6b0

data/lib/rdeis/deis.rb

@@ -163,11 +163,16 @@ module DEIS
       end
     end
 
-    desc "updgrade", "See if older version exists we can copy over"
-    def updgrade
-      run = DEIS::Upgrade.new(options)
+    desc "updgrade <from>", "See if older version exists we can copy over"
+    def updgrade(from=nil)
+      run = DEIS::Upgrade.new(options, from)
       run.all
     end
 
+    desc "version", "See version number"
+    def version
+      say "rdeis #{DEIS::VERSION}"
+    end
+
   end
 end

data/lib/rdeis/deploy.rb

@@ -17,7 +17,7 @@ module DEIS
       @branch = DEIS::Git.branch
       @remote = DEIS::Git.remote
 
-      @name = @repo+"-"+@environment
+      @name = @repo.gsub("_", "-")+"-"+@environment
       @deploy_to = @base_path.to_s + "/"+ @name + "/"
       @ssh = SSH.new({:host => @proxy, :user => nil}) if ! @proxy.nil?
     end

data/lib/rdeis/git.rb

@@ -44,7 +44,7 @@ module DEIS
     end
 6
     def self.checkout_to_ref_cmd(ref, branch)
-      "git fetch origin && git checkout -f origin/#{branch} && git branch -d #{branch} ; git checkout -f #{branch} && git checkout -f #{ref} 2>&1 | grep 'error:' | wc -l"
+      "git fetch origin && git checkout -f origin/#{branch} 2>&1 /dev/null && git branch -d #{branch} 2>&1 /dev/null; git checkout -f #{branch} 2>&1 /dev/null && git checkout -f #{ref} 2>&1 | grep 'error:' | wc -l"
     end
 
     # find env based token

data/lib/rdeis/storage.rb

@@ -24,13 +24,13 @@ module DEIS
       current = DEIS::Storage.load(repo, env)
       # key asked for and is present
       if ! key.nil? && current.has_key?(key)
-        current[key]
+        current[key].sort_by{|k,v| k }
       # key asked for but not present
       elsif !key.nil?
         {}
       # key not asked for
       else
-        current
+        current.sort_by{|k,v| k }
       end
     end
 

data/lib/rdeis/upgrade.rb

@@ -4,19 +4,20 @@ module DEIS
 
     attr_accessor :proxy, :token, :ssh, :deploy_to
 
-    def initialize(options)
+    def initialize(options, previous=nil)
       @repo = DEIS::Git.name
       @verbose = options[:verbose]
       @environment = options[:environment]
       @proxy = if ! options["proxy"].nil? then options["proxy"] elsif ! ENV['RDEIS_PROXY'].nil? then ENV['RDEIS_PROXY'] else nil end
       @ssh = SSH.new({:host => @proxy, :user => nil}) if ! @proxy.nil?
+      @previous = if previous.nil? then DEIS::LAST_VERSION else previous end
     end
 
     
 
     def all
       # check for current version
-      previous_version = DEIS::Storage::BASE_PATH.gsub(DEIS::VERSION, DEIS::LAST_VERSION)
+      previous_version = DEIS::Storage::BASE_PATH.gsub(DEIS::VERSION, @previous)
       local_prev = previous_version.gsub("$HOME", ENV['HOME'])
       current_version = DEIS::Storage::BASE_PATH
       local_curr = current_version.gsub("$HOME", ENV['HOME'])

data/lib/rdeis/version.rb

@@ -1,4 +1,4 @@
 module DEIS
-  VERSION='0.0.12'
-  LAST_VERSION='0.0.11'
-end
+  VERSION='0.0.13'
+  LAST_VERSION='0.0.12'
+end		

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdeis
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Charles Marshall
@@ -79,7 +79,7 @@ files:
 - lib/rdeis/version.rb
 - lib/ssh.rb
 - rdeis.gemspec
-homepage: https://github.com/charlesmarshall/deis_deploy/tree/0.0.12
+homepage: https://github.com/charlesmarshall/deis_deploy/tree/0.0.13
 licenses:
 - MIT
 metadata: {}