rdeis 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dffbcf515f435b9a9a0e2520f252020442b2d233
-  data.tar.gz: 77460a77a74a66c68dae96ff82d14a335388d12a
+  metadata.gz: 95f8ccbbdf536ffbf9e3f06a7bc0be6098a13a4f
+  data.tar.gz: ffda91ae7fabf93ca6738fdea20e728041de5674
 SHA512:
-  metadata.gz: f91327aba85ae9e87c996f5956dd91dbc50b475970e3bc8459fb63726d52205bd1c7d9e1e6194600c3ba899c629bba70cc13d2aca8c9744001bb39df2b7f250c
-  data.tar.gz: 360c88693dfc2b06aa0fd020dc2cb3f3c2fc12576c2fd811dc12b3510db3c146fb9a25f43add9d221ff9b73a3d8b8e4313c72fe9864d7606d1d4500c9dd6a13d
+  metadata.gz: ebc6893431f3bb3fbceb599561fbeee2ababe30c0f676e9382760f12d3f716e324d94ac07b5aa10cb194655779aef85af497236ea227757466d91e4b1e1ca2a9
+  data.tar.gz: ca1126459a60e4268e96fabd4fafea82727651779ac11853f7ee7ce4b59977523d8297b8dbe36a1b40f55cd3feda55a589a4f898e62a17f3d7b1900e59580a50

data/gemconversion

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 file = "./Gemfile"
-ignore = "./gitignore"
+ignore = "./.gitignore"
 ruby_version = `ruby -v | grep "ruby [0-9]\.[0-9]\.[0-9]" -o | sed -E "s#ruby ##"`.strip
 if File.exists?(file)
   contents = File.open(file, "r") {|f| f.read }
@@ -12,12 +12,10 @@ if File.exists?(file)
   contents = contents + "\nruby \"#{ruby_version}\" " if version_found.nil?
   # write back to file
   File.open(file, "w"){ |f| f.write(contents) }
-  # add this file to the gitignore
-  if File.exists?(ignore)
-    puts "adding to ignore file"
-    igoring = File.open(ignore, "r"){|g| g.read }
-    File.open(ignore, "w"){|g| g.write(ignoring.gsub("gemconversion", "") + "\ngemconversion" ) }
-  end
+  ignoring = ""
+  puts "adding to ignore file"
+  ignoring = File.open(ignore, "r"){|g| g.read } if File.exists?(ignore)
+  File.open(ignore, "w"){|g| g.write(ignoring.gsub("gemconversion", "") + "gemconversion" ) }
   # look for ruby version file
   `echo "#{ruby_version}" > ./.ruby-version` if ! File.exists?(".ruby-version")
   # run the bundle
@@ -26,12 +24,14 @@ if File.exists?(file)
   status = `git status | grep "modified.*Gemfile" | wc -l`.to_i
   # create the commit
   commit = 0
-  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
-
+  `git checkout -b deis_#{Time.now.to_i} && git add .gitignore Gemfile Gemfile.lock .ruby-version`
+  commit = `git commit .gitignore Gemfile Gemfile.lock .ruby-version -m '[rdeis] Automated Gemfile conversion - #{Time.now.to_s}' 2>&1 | grep 'Error' | wc -l`.to_i if install == 1 && status > 0
+  head = `sleep 1 && echo $(git rev-parse HEAD)`
+  
   if status == 0
-    $stdout.puts "Converted and commited already"
+    $stdout.puts "Converted and commited already (#{install}/#{commit})"
   elsif install == 1 && commit == 0
-    $stdout.puts "Converted and commited"
+    $stdout.puts "Converted and commited (#{install}/#{commit})"
   else
     abort("Error: install / commit failed (#{install}/#{commit})")
   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, @branch)}")
+      checkout = run ("cd #{@deploy_to} && #{DEIS::Git.checkout_to_ref_cmd(@ref, @branch)}")
       output[" checkout to #{@ref[0..8]}"] = if checkout then DEIS::Deploy::YES else DEIS::Deploy::NO end
       print_table output
     end
@@ -164,7 +164,8 @@ module DEIS
       output[" Gem conversion"] = if conversion == 1 then DEIS::Deploy::YES else DEIS::Deploy::NO end
       # push the branch to deis
       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
+      remote_branch = run("cd #{@deploy_to} && #{DEIS::Git.branch_cmd}")
+      deis = run("cd #{@deploy_to} && git push deis #{remote_branch} | 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

data/lib/rdeis/git.rb

@@ -32,15 +32,19 @@ module DEIS
     end
 
     def self.branch
-      `git rev-parse --abbrev-ref HEAD`.strip
+      `#{DEIS::Git.branch_cmd}`.strip
+    end
+
+    def self.branch_cmd
+      "git rev-parse --abbrev-ref HEAD"
     end
 
     def self.init_with_remote_cmd(remote)
       "git init && git remote add origin #{remote} 2>&1 | grep 'fatal:' -o | wc -l"
     end
-
+6
     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"
+      "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"
     end
 
     # find env based token

data/lib/rdeis/version.rb

@@ -1,4 +1,4 @@
 module DEIS
-  VERSION='0.0.10'
-  LAST_VERSION='0.0.8'
+  VERSION='0.0.11'
+  LAST_VERSION='0.0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdeis
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 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.10
+homepage: https://github.com/charlesmarshall/deis_deploy/tree/0.0.11
 licenses:
 - MIT
 metadata: {}