bard 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2680eef24b5d9b45721ae0ba983117087f585943
-  data.tar.gz: 4f2611c48f1f7c4456239ae5434fccaca9222f50
+  metadata.gz: 719e47d893872fefe3cfd4dfe73ddb4f68d10ad9
+  data.tar.gz: a3b3e76ac8fc203fe45d517b7655b5e2bbaab062
 SHA512:
-  metadata.gz: a252cb91d17cc6eee7eb17205462dae8bb2f4cc76da1cdc53742adf684255b30977337c76d7016ca2f83d1fc0c925eeeff80bc2e407b6c09681b54813e092902
-  data.tar.gz: 5ea4d06fbd9611c81d90471320a78ddcb143abcf553e3bc596d6983e1abc05676d716c4d967d25b193c094026f76b579ff6675e101e29835c9f5facb4cd1e3d3
+  metadata.gz: 2a2924218f5827b6b65b28005d5268cab74cefc234ef6b52f08b28d15ea3314cf003a54179c233c86893136f49c847980b48588711f20c7eb0ce0c3c7adc146c
+  data.tar.gz: 7bc7b1940e0984957315ee22845f363cd3657bb172cb12cae68c22befcdf6486a533901a76a086482b6d01b05e0df00824c477cc642d7f13720e2d2a5ad0c72f

data/lib/bard.rb

@@ -25,6 +25,10 @@ class Bard::CLI < Thor
   method_options %w( verbose -v ) => :boolean
   desc "stage", "pushes current branch, and stages it"
   def stage
+    unless File.read("Capfile").include?("role :production")
+      raise Thor::Error.new("`bard stage` is disabled until a production server is defined. Until then, please use `bard deploy` to deploy to the staging server.")
+    end
+
     branch = Git.current_branch
 
     run_crucial "git push -u origin #{branch}", true

data/lib/bard/capistrano.rb

@@ -16,8 +16,6 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace "pull" do
       desc "pull data"
       task "default" do
-        exec "heroku db:pull --confirm #{project_name}" if heroku?(ENV["ROLES"])
-
         run "cd #{application} && bundle exec rake db:dump && gzip -9f db/data.sql"
         transfer :down, "#{application}/db/data.sql.gz", "db/data.sql.gz"
         system "gunzip -f db/data.sql.gz && bundle exec rake db:load"
@@ -63,32 +61,19 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "push app to production"
   task :deploy do
-    if heroku? "production"
-      system "git push production master"
-      system "heroku run rake bootstrap:production:post"
-    else
-      ENV["ROLES"] = "production"
-      find_and_execute_task "rvm:install_ruby"
-      system "git push github" if `git remote` =~ /\bgithub\b/
-      run "cd #{application} && git pull origin master && bin/setup", :roles => :production
-    end
+    deploy_roles = roles.keys.include?(:production) ? :production : :staging
+    ENV["ROLES"] = deploy_roles.to_s
+    find_and_execute_task "rvm:install_ruby"
+    system "git push github" if `git remote` =~ /\bgithub\b/
+    run "cd #{application} && git pull origin master && bin/setup", roles: deploy_roles
   end
 
   desc "push app to staging"
   task :stage do
-    if heroku? "staging"
-      system "git push -f staging master"
-      system "heroku run rake bootstrap:production:post"
-    else
-      ENV["ROLES"] = "staging"
-      find_and_execute_task "rvm:install_ruby"
-      branch = ENV.fetch("BRANCH")
-      run "cd #{application} && git fetch && git checkout -f origin/#{branch} && bin/setup", :roles => :staging
-    end
-  end
-
-  def heroku? role
-    `git remote -v`.include? "#{role}\tgit@heroku.com:"
+    ENV["ROLES"] = "staging"
+    find_and_execute_task "rvm:install_ruby"
+    branch = ENV.fetch("BRANCH")
+    run "cd #{application} && git fetch && git checkout -f origin/#{branch} && bin/setup", :roles => :staging
   end
 
   desc "log in via ssh"

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.29.0"
+  VERSION = "0.30.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor