stack_car 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc0c3e1f27e698861c2c9bccffd68f6879ff9da5
-  data.tar.gz: e666418ddb4ac4a73d01e0eed0ac40db91c6435a
+  metadata.gz: 185a0b49e3f2bdac8994507a50f3454d1455df64
+  data.tar.gz: 1a924d44567950615378184317b421e9c9ccee51
 SHA512:
-  metadata.gz: e16e46c835e97f0807ead8f7b7166f83cf03b4cc3428bd8678c4523edba79c5e8a4907172753c136e682970efb1196e06f961b4910a43f4a6ffccad8652e87a1
-  data.tar.gz: 6c444905ee7725c0258ac4f8a1aa5199276271363928c3ebf5566bf6e6a21ef6ea8b7f133f758d07b985c94ce406239f9516473422d2462a46d812b65a8d132d
+  metadata.gz: c65cd894261123a12ebf2ac3f47a39b57a44aea50f87e1d481e255b755c9edc490ffa32dd4ae9e61e777be0cc3c44e89e2b43ea885ffe236da8f3540577862f1
+  data.tar.gz: 24e5e23aceb5cbd161017047ef4ee1d54b01288877d21ad3e8598659bd90b8f5c9f617c005a31e30c346bff01295ca2dbff3037737bfe7e1edfd3d53fb4e8ce6

data/lib/stack_car/cli.rb

@@ -25,78 +25,78 @@ module StackCar
         run("docker-compose pull #{options[:service]}")
       end
 
-      run("docker-compose up #{args.join(' ')} #{options[:service]}")
+      run_with_exit("docker-compose up #{args.join(' ')} #{options[:service]}")
     end
 
     method_option :service, default: '', type: :string, aliases: '-s'
     desc "stop", "stops the specified running service, defaults to all"
     def stop
       run("docker-compose stop #{options[:service]}")
-      run("rm -rf tmp/pids/*")
+      run_with_exit("rm -rf tmp/pids/*")
     end
     map down: :stop
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
     desc "build", "builds specified service, defaults to web"
     def build
-      run("docker-compose build #{options[:service]}")
+      run_with_exit("docker-compose build #{options[:service]}")
     end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
     desc "push ARGS", "wraps docker-compose push web unless --service is used to specify"
     def push(*args)
-      run("docker-compose push #{options[:service]} #{args.join(' ')}")
+      run_with_exit("docker-compose push #{options[:service]} #{args.join(' ')}")
     end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
     desc "pull ARGS", "wraps docker-compose pull web unless --service is used to specify"
     def pull(*args)
-      run("docker-compose pull #{options[:service]} #{args.join(' ')}")
+      run_with_exit("docker-compose pull #{options[:service]} #{args.join(' ')}")
     end
 
     method_option :service, default: '', type: :string, aliases: '-s'
     desc "ps ARGS", "wraps docker-compose pull web unless --service is used to specify"
     def ps(*args)
-      run("docker-compose ps #{options[:service]} #{args.join(' ')}")
+      run_with_exit("docker-compose ps #{options[:service]} #{args.join(' ')}")
     end
     map status: :ps
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
     desc "bundle ARGS", "wraps docker-compose run web unless --service is used to specify"
     def bundle(*args)
-      run("docker-compose exec #{options[:service]} bundle")
+      run_with_exit("docker-compose exec #{options[:service]} bundle")
     end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
     desc "walk ARGS", "wraps docker-compose run web unless --service is used to specify"
     def walk(*args)
-      run("docker-compose run #{options[:service]} #{args.join(' ')}")
+      run_with_exit("docker-compose run #{options[:service]} #{args.join(' ')}")
     end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
     desc "exec ARGS", "wraps docker-compose exec web unless --service is used to specify"
     def exec(*args)
-      run("docker-compose exec #{options[:service]} #{args.join(' ')}")
+      run_with_exit("docker-compose exec #{options[:service]} #{args.join(' ')}")
     end
     map ex: :exec
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
     desc 'sh ARGS', "launch a shell using docker-compose exec, sets tty properly"
     def sh(*args)
-      run("docker-compose exec -e COLUMNS=\"\`tput cols\`\" -e LINES=\"\`tput lines\`\" #{options[:service]} bash #{args.join(' ')}")
+      run_with_exit("docker-compose exec -e COLUMNS=\"\`tput cols\`\" -e LINES=\"\`tput lines\`\" #{options[:service]} bash #{args.join(' ')}")
     end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
     desc "bundle_exec ARGS", "wraps docker-compose exec web bundle exec unless --service is used to specify"
     def bundle_exec(*args)
-      run("docker-compose exec #{options[:service]} bundle exec #{args.join(' ')}")
+      run_with_exit("docker-compose exec #{options[:service]} bundle exec #{args.join(' ')}")
     end
     map be: :bundle_exec
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
     desc "console ARGS", "shortcut to start rails console"
     def console(*args)
-      run("docker-compose exec #{options[:service]} bundle exec rails console #{args.join(' ')}")
+      run_with_exit("docker-compose exec #{options[:service]} bundle exec rails console #{args.join(' ')}")
     end
     map rc: :console
 
@@ -107,29 +107,29 @@ module StackCar
       registry = "#{ENV['REGISTRY_HOST']}#{ENV['REGISTRY_URI']}"
       tag = ENV["TAG"] || 'latest'
       unless File.exists?("#{ENV['HOME']}/.docker/config.json") && File.readlines("#{ENV['HOME']}/.docker/config.json").grep(/#{ENV['REGISTRY_HOST']}/).size > 0
-        run("docker login #{ENV['REGISTRY_HOST']}")
+        run_with_exit("docker login #{ENV['REGISTRY_HOST']}")
       end
-      run("docker tag #{registry}:#{tag} #{registry}:#{environment}-#{timestamp}")
-      run("docker push #{registry}:#{environment}-#{timestamp}")
-      run("docker tag #{registry}:#{tag} #{registry}:#{sha}")
-      run("docker push #{registry}:#{sha}")
-      run("docker tag #{registry}:#{tag} #{registry}:#{environment}-latest")
-      run("docker push #{registry}:#{environment}-latest")
-      run("docker tag #{registry}:#{tag} #{registry}:latest")
-      run("docker push #{registry}:latest")
+      run_with_exit("docker tag #{registry}:#{tag} #{registry}:#{environment}-#{timestamp}")
+      run_with_exit("docker push #{registry}:#{environment}-#{timestamp}")
+      run_with_exit("docker tag #{registry}:#{tag} #{registry}:#{sha}")
+      run_with_exit("docker push #{registry}:#{sha}")
+      run_with_exit("docker tag #{registry}:#{tag} #{registry}:#{environment}-latest")
+      run_with_exit("docker push #{registry}:#{environment}-latest")
+      run_with_exit("docker tag #{registry}:#{tag} #{registry}:latest")
+      run_with_exit("docker push #{registry}:latest")
     end
 
     desc "provision ENVIRONMENT", "configure the servers for docker and then deploy an image"
     def provision(environment)
       # TODO make dotenv load a specific environment?
-      run("DEPLOY_ENV=#{environment} dotenv ansible-playbook -i ops/hosts -l #{environment}:localhost ops/provision.yml")
+      run_with_exit("DEPLOY_ENV=#{environment} dotenv ansible-playbook -i ops/hosts -l #{environment}:localhost ops/provision.yml")
     end
 
     desc "ssh ENVIRONMENT", "log in to a running instance - requires PRODUCTION_SSH to be set"
     def ssh(environment)
       target = ENV["#{environment.upcase}_SSH"]
       if target
-        run(target)
+        run_with_exit(target)
       else
         say "Please set #{environment.upcase}_SSH"
       end
@@ -137,7 +137,7 @@ module StackCar
 
     desc "deploy ENVIRONMENT", "deploy an image from the registry"
     def deploy(environment)
-      run("DEPLOY_HOOK=$DEPLOY_HOOK_#{environment.upcase} dotenv ansible-playbook -i ops/hosts -l #{environment}:localhost ops/deploy.yml")
+      run_with_exit("DEPLOY_HOOK=$DEPLOY_HOOK_#{environment.upcase} dotenv ansible-playbook -i ops/hosts -l #{environment}:localhost ops/deploy.yml")
     end
 
     method_option :elasticsearch, default: false, type: :boolean, aliases: '-e'
@@ -257,5 +257,12 @@ module StackCar
       post_apt.join(" && \\\n")
     end
 
+    def run_with_exit(*args)
+      result = run(*args)
+      if !result
+        exit(1)
+      end
+    end
+
   end
 end

data/lib/stack_car/version.rb

@@ -1,3 +1,3 @@
 module StackCar
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

data/templates/env.conf.erb

@@ -1,4 +1,5 @@
 <% if options[:postgres] -%>
+env DB_ADAPTER;
 env POSTGRES_DB;
 env POSTGRES_USER;
 env POSTGRES_PASSWORD;
@@ -6,6 +7,7 @@ env POSTGRES_HOST;
 env TEST_DB;
 <% end -%>
 <% if options[:mysql] -%>
+env DB_ADAPTER;
 env MYSQL_DATABASE;
 env MYSQL_USER;
 env MYSQL_PASSWORD;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stack_car
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler