rake-stretcher 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb200b9a100a9469597ab888486e69f9ca0b7e42
-  data.tar.gz: 34bdfee5f82ada8cd95df6fdeee4ced60874263f
+  metadata.gz: cf852652d01fd138c90721cfcbfe0b0d056e82c9
+  data.tar.gz: b14befb9b9beaa48611fd6c5a14ff58d879d2c1a
 SHA512:
-  metadata.gz: 7c3d9cac4b127afbfe83ac5a9ef2e8b5d488215bd82cc01dd0bbd1f7690685a90ff5ee803c8240bf0b96f5f75fd669ba7539c8f44c9ca3f314d59bb63851975e
-  data.tar.gz: aec64ec474f8591b8c9e9897e41dd808d4868ba442f0a65d86812e508e3a928ada210dc2cd957f04df5e61bc5c2066a27c2bab204be03b4e881477cbfe47fedd
+  metadata.gz: a2ee5db89b8204a962a79391cc0fe8b50d8ed9dc76f2c1084df206ddfcfac1c78d6d7f7aacfd92ea87253b6e43fcd192311d4372d20624f7e6342d7a66408674
+  data.tar.gz: 8722c6ddc4ce3c21dc27fb7234119467e5f0ebf4232b6c7bf87f442b15f2611bacdb673c57af14fa8884996aac22904e6e3281bbf0d26ddd12205d1c64834b3f

data/lib/rake/stretcher/tasks/stretcher.rake

@@ -38,7 +38,7 @@ namespace :stretcher do
   end
 
   def branch
-    ENV['CIRCLE_BRANCH'] ||= 'master'
+    config['branch'] ||= 'master'
   end
 
   def current_version
@@ -49,12 +49,12 @@ namespace :stretcher do
     '--exclude tmp'
   end
 
-  def rails_env
-    config['rails_env'] ||= ENV['RAILS_ENV']
+  def environment
+    config['environment'] ||= ENV['environment']
   end
 
-  def local_tarball_name
-    config['local_tarball_name']
+  def tarball_name
+    config['tarball_name']
   end
 
   def stretcher_path
@@ -62,11 +62,11 @@ namespace :stretcher do
   end
 
   def stretcher_src
-    "#{stretcher_path}/rails-application-#{time_now}.tgz"
+    "#{stretcher_path}/#{remote_tarball_name}-#{time_now}.tgz"
   end
 
   def checksum
-    %x(openssl sha256 #{local_tarball_path}/current/#{local_tarball_name} | awk -F' ' '{print $2}').chomp
+    %x(openssl sha256 #{local_tarball_path}/current/#{tarball_name} | awk -F' ' '{print $2}').chomp
   end
 
   def deploy_to
@@ -130,7 +130,7 @@ namespace :stretcher do
       cd #{local_build_path}
       mkdir -p "#{local_tarball_path}/#{time_now}"
       tar -cf - --exclude tmp --exclude spec ./ | gzip -9 > \
-        #{local_tarball_path}/#{time_now}/#{local_tarball_name}
+        #{local_tarball_path}/#{time_now}/#{tarball_name}
     EOC
     sh <<-EOC
       cd #{local_tarball_path}
@@ -142,7 +142,7 @@ namespace :stretcher do
   desc "upload tarball to s3"
   task :upload_tarball do
     sh <<-EOC
-      aws s3 cp #{local_tarball_path}/current/#{local_tarball_name} #{stretcher_src}
+      aws s3 cp #{local_tarball_path}/current/#{tarball_name} #{stretcher_src}
     EOC
   end
 
@@ -159,10 +159,10 @@ namespace :stretcher do
       end
       p tempfile_path
       sh <<-EOC
-       mv  #{tempfile_path} "#{local_tarball_path}/current/manifest_#{role}_#{rails_env}_#{time_now}.yml"
+       mv  #{tempfile_path} "#{local_tarball_path}/current/manifest_#{role}_#{environment}_#{time_now}.yml"
       EOC
       sh <<-EOC
-        aws s3 cp "#{local_tarball_path}/current/manifest_#{role}_#{rails_env}_#{time_now}.yml" "#{manifest_path}/manifest_#{role}_#{rails_env}_#{time_now}.yml"
+        aws s3 cp "#{local_tarball_path}/current/manifest_#{role}_#{environment}_#{time_now}.yml" "#{manifest_path}/manifest_#{role}_#{environment}_#{time_now}.yml"
       EOC
     end
   end
@@ -170,11 +170,11 @@ namespace :stretcher do
   desc "kick start consul event"
   task :kick_start do
     deploy_roles.each do |role|
-      o, e, s = Open3.capture3("aws s3 ls #{manifest_path}/manifest_#{role}_#{rails_env} | awk -F' ' '{print $4}' | tail -1")
+      o, e, s = Open3.capture3("aws s3 ls #{manifest_path}/manifest_#{role}_#{environment} | awk -F' ' '{print $4}' | tail -1")
       current_manifest = o.chomp
       puts "kick start -> #{current_manifest}"
       sh <<-EOC
-        curl -X PUT -d "#{manifest_path}/#{current_manifest}" http://#{consul_host}:8500/v1/event/fire/deploy_#{role}_#{rails_env}\?pretty
+        curl -X PUT -d "#{manifest_path}/#{current_manifest}" http://#{consul_host}:8500/v1/event/fire/deploy_#{role}_#{environment}\?pretty
       EOC
     end
   end
@@ -182,11 +182,11 @@ namespace :stretcher do
   desc "rollback consul event"
   task :rollback do
     deploy_roles.each do |role|
-      o, e, s = Open3.capture3("aws s3 ls #{manifest_path}/manifest_#{role}_#{rails_env} | awk -F' ' '{print $4}' | tail -2 | head -1")
+      o, e, s = Open3.capture3("aws s3 ls #{manifest_path}/manifest_#{role}_#{environment} | awk -F' ' '{print $4}' | tail -2 | head -1")
       current_manifest = o.chomp
       puts "kick start -> #{current_manifest}"
       sh <<-EOC
-        curl -X PUT -d "#{manifest_path}/#{current_manifest}" http://#{consul_host}:8500/v1/event/fire/deploy_#{role}_#{rails_env}\?pretty
+        curl -X PUT -d "#{manifest_path}/#{current_manifest}" http://#{consul_host}:8500/v1/event/fire/deploy_#{role}_#{environment}\?pretty
       EOC
     end
   end

data/lib/rake/stretcher/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Stretcher
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-stretcher
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - tjinjin