rdeis 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e431193be3f11c8a16ec86a1c8dca819c4d40c3
-  data.tar.gz: 60b56e68e24f58cc963c7500a60f0ce3105d4b04
+  metadata.gz: 1df42fa5b070732b2b16e19b57508360a42c282e
+  data.tar.gz: 2361bb85b58778e8a68c325968c49b11d02ca5ee
 SHA512:
-  metadata.gz: 11efa491d12bc6415c807e337dce9a71cc4a51bf4d82913cf92bcb4f1ee4b0d35cec2baa438b359e5434517c13d4343634ae6ea405c25ca524469ffc789deb27
-  data.tar.gz: e1caf1870d1b832662fe507322e477844311e6d4197fa844a157b7c26bf1c022921df7cf740db426e28238fcbc347e6357c558a3ead0e10473711453f6391971
+  metadata.gz: 8bfaf8f5454b2499175d8336fd2fa1a6d3c20bbab7ba421feeb442b2cefdd254f8290f710007d3a0ea4274fb20fad3cfa24c58f67e92337d3d3dc0d95f18ddd6
+  data.tar.gz: 5609ff5c1e12fb08d3931e45a9c0395e920c9e2b083af77ff460817a7fccf6b83b28ea1e15e384d3d88314ff1698dd526b2651de22685a88d77e45418a917148

data/gemconversion

@@ -23,9 +23,9 @@ if File.exists?(file)
   commit = `git commit Gemfile Gemfile.lock -m '[rdeis] Automated Gemfile conversion - #{Time.now.to_s}' 2>&1 | grep 'Error' | wc -l`.to_i if install == 1 && status > 0
 
   if status == 0
-    $stdout.puts "Already converted & commited"
+    $stdout.puts "Converted and commited already"
   elsif install == 1 && commit == 0
-    $stdout.puts "Converted & commited"
+    $stdout.puts "Converted and commited"
   else
     abort("Error: install / commit failed (#{install}/#{commit})")
   end

data/lib/rdeis/base.rb

@@ -19,5 +19,22 @@ module DEIS
       end
     end
 
+    def local_shell
+      `echo $SHELL | sed -E "s#/bin/##"`.strip
+    end
+
+    def local_profile
+      "#{ENV['HOME']}/.profile"
+    end
+
+    def remote_profile
+      "$HOME/.profile"
+    end
+
+    def local_shell_env_include(profile, file_to_include)
+      content = File.open(profile, "r"){ |f| f.read }.gsub(". #{file_to_include}", "") + "\n. #{file_to_include}"
+      File.open(profile, "w") { |f| f.write(content) }
+    end
+
   end
 end

data/lib/rdeis/bootstrap.rb

@@ -45,7 +45,7 @@ module DEIS
 
     # add a hush login file so we dont get the MOTD ouput in our shell commands
     def hush
-      if yes? ("Does the deploy location run a Message of the Day? ")
+      if yes?("Does the deploy location run a Message of the Day? ", :yellow)
         run("if [[ ! -f $HOME/.hushlogin ]]; then > $HOME/.hushlogin ; fi ")
       end
     end
@@ -80,16 +80,15 @@ module DEIS
       # run remote, keep the $HOME notation as we want that evaluated in the cmd
       run("mkdir -p #{DEIS::Storage::BASE_PATH} ; echo -e '#{out}' > #{file}") if ! @proxy.nil?
       # remove any existing references from the various shell options on the local machine
-      shell=`echo $SHELL | sed -E "s#/bin/##"`.strip
-      profile = ["#{ENV['HOME']}/.#{shell}rc", "#{ENV['HOME']}/.#{shell}_profile", "#{ENV['HOME']}/.profile"].select{|f| File.exists?(f)}.first
+      shell = self.local_shell
+      profile = self.local_profile
       if ! profile.nil?
-        content = File.open(profile, "r"){ |f| f.read }.gsub(". #{file}", "") + "\n. #{file}"
-        File.open(profile, "w") { |f| f.write(content) }
+        self.local_shell_env_include(profile, file)
       else
         say "Could not save environment setup", :red
       end
       # add include to the remote profile
-      run("echo -e '. #{file}\n' >> ~/.profile") if ! @proxy.nil?
+      run("echo -e '. #{file}\n' >> #{self.remote_profile}") if ! @proxy.nil?
     end
 
   end

data/lib/rdeis/deis.rb

@@ -154,6 +154,7 @@ module DEIS
 
     desc "bootstrap <type>", "first run install setup funcs"
     def bootstrap(action="all")
+      self.updgrade
       if DEIS::Bootstrap.method_defined? action
         bootstrap = DEIS::Bootstrap.new(options)
         bootstrap.send(action)
@@ -162,6 +163,11 @@ module DEIS
       end
     end
 
+    desc "updgrade", "See if older version exists we can copy over"
+    def updgrade
+      run = DEIS::Upgrade.new(options)
+      run.all
+    end
 
   end
 end

data/lib/rdeis/deploy.rb

@@ -133,7 +133,7 @@ module DEIS
         output[" init and remote"] = DEIS::Deploy::YES
       end
       # checkout to the correct branch from the remote
-      checkout = run ("cd #{@deploy_to} && #{DEIS::Git.checkout_to_ref_cmd('origin/'+@ref)}")
+      checkout = run ("cd #{@deploy_to} && #{DEIS::Git.checkout_to_ref_cmd('origin/'+@ref, @branch)}")
       output[" checkout to #{@ref[0..8]}"] = if checkout then DEIS::Deploy::YES else DEIS::Deploy::NO end
       print_table output
     end
@@ -160,12 +160,18 @@ module DEIS
     def push
       output = {"PUSH" => ""}
       # make sure the profile is loaded, cd to the right place & run the converstion script.
-      conversion = run(". $HOME/.profile && cd #{@deploy_to} && ./gemconversion | grep Error | wc -l").to_i
-      output[" Gem conversion"] = if conversion == 0 then DEIS::Deploy::YES else DEIS::Deploy::NO end
+      conversion = run(". #{self.remote_profile} && cd #{@deploy_to} && ./gemconversion | grep 'Converted and commited' | wc -l").to_i
+      output[" Gem conversion"] = if conversion == 1 then DEIS::Deploy::YES else DEIS::Deploy::NO end
       # push the branch to deis
-      deis = run("cd #{@deploy_to} && git push deis #{@branch} | grep Error | wc -l") if conversion == 0
+      remote_ref = run("cd #{@deploy_to} && #{DEIS::Git.ref_cmd}")
+      deis = run("cd #{@deploy_to} && git push deis #{@branch}:#{remote_ref} | grep Error | wc -l") if conversion == 1
       output[" Deis push"] =  if deis.to_i == 0 then DEIS::Deploy::YES else DEIS::Deploy::NO end
       print_table output
+      if conversion != 1
+        say "Gem conversion & commit failed.", :red
+        say "This could be due to environment settings being missing; please make sure ruby is installed and env set in .profile", :red
+        exit
+      end
     end
 
     def scale(vars)

data/lib/rdeis/git.rb

@@ -24,7 +24,11 @@ module DEIS
     end
 
     def self.ref
-      `git rev-parse --verify HEAD 2>/dev/null`.strip
+      `#{DEIS::Git.ref_cmd}`.strip
+    end
+
+    def self.ref_cmd
+      "git rev-parse --verify HEAD 2>/dev/null"
     end
 
     def self.branch
@@ -35,8 +39,8 @@ module DEIS
       "git init && git remote add origin #{remote} 2>&1 | grep 'fatal:' -o | wc -l"
     end
 
-    def self.checkout_to_ref_cmd(ref)
-      "git fetch origin && git checkout -f #{ref} 2>&1 | grep 'error:' | wc -l"
+    def self.checkout_to_ref_cmd(ref, branch)
+      "git fetch origin && git checkout -f #{branch} && git checkout -f #{ref} 2>&1 | grep 'error:' | wc -l"
     end
 
     # find env based token

data/lib/rdeis/upgrade.rb

@@ -0,0 +1,46 @@
+module DEIS
+  class Upgrade < Base
+    include Thor::Shell
+
+    attr_accessor :proxy, :token, :ssh, :deploy_to
+
+    def initialize(options)
+      @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?
+    end
+
+    
+
+    def all
+      # check for current version
+      previous_version = DEIS::Storage::BASE_PATH.gsub(DEIS::VERSION, DEIS::LAST_VERSION)
+      local_prev = previous_version.gsub("$HOME", ENV['HOME'])
+      current_version = DEIS::Storage::BASE_PATH
+      local_curr = current_version.gsub("$HOME", ENV['HOME'])
+      # local
+      # if no found, look for previous version
+      if ! File.directory?(local_curr) && File.directory?(local_prev)
+        say("Found previous version config files locally, migrating..", :green)
+        `mv -f #{local_prev} #{local_curr}`
+        # find local profile
+        content = File.open(self.local_profile, "r"){|f| f.read }
+        File.open(self.local_profile, "w"){|f| f.write(content.gsub(previous_version, current_version)) }
+      end
+      # remote
+      remote_current = run("ls -lart #{current_version} | wc -l").to_i
+      remote_previous = run("ls -lart #{previous_version} | wc -l").to_i
+      if remote_current == 0 && remote_previous > 1
+        say("Found previous remote version, migration..", :green)
+        run("mv -f #{previous_version} #{current_version}")
+        # replace profile
+        run("cat #{self.remote_profile} | sed -E 's##{previous_version.gsub("$", "\\\$")}##{current_version.gsub("$", "\\\$")}#' > #{self.remote_profile}.new && mv #{self.remote_profile} #{self.remote_profile}.bk && mv #{self.remote_profile}.new #{self.remote_profile}")
+      end
+    end
+
+    
+
+  end
+end

data/lib/rdeis/version.rb

@@ -1,3 +1,4 @@
 module DEIS
-  VERSION='0.0.4'
+  VERSION='0.0.8'
+  LAST_VERSION='0.0.4'
 end

data/lib/rdeis.rb

@@ -8,6 +8,7 @@ module DEIS
   require "rdeis/parse"
   require "rdeis/storage"
   require "rdeis/bootstrap"
+  require "rdeis/upgrade"
   require "rdeis/config"
   require "rdeis/domains"
   require "rdeis/deploy"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdeis
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - Charles Marshall
@@ -75,10 +75,11 @@ files:
 - lib/rdeis/git.rb
 - lib/rdeis/parse.rb
 - lib/rdeis/storage.rb
+- lib/rdeis/upgrade.rb
 - lib/rdeis/version.rb
 - lib/ssh.rb
 - rdeis.gemspec
-homepage: https://github.com/charlesmarshall/deis_deploy/tree/0.0.4
+homepage: https://github.com/charlesmarshall/deis_deploy/tree/0.0.8
 licenses:
 - MIT
 metadata: {}