soyuz 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59015ed20e3495f427c78b40f2846156ec4f5635
-  data.tar.gz: 8c25a79206d5a813d5b1f5507ae62de364d4fa60
+  metadata.gz: 473101441a21cdb99583187dbf13b0239375eae3
+  data.tar.gz: 3c497ec52e6914061136c10786c12c5b17463296
 SHA512:
-  metadata.gz: 4d46c3f96343aa2da24b52830a4cac00250c11b299f9b10dbece7176252f898700196eaa6711cf5ae3de6e9329c9de2f455e8fe6cfb6dbd915dc433ae6b7b617
-  data.tar.gz: 3b398f211d1d670e8994a7c9a1237f3992aff052d5f358c783151731de5de9611a4077547f89a3f3cf19e9521325754cc87160b7b841b244e78b1c274c5f7ba6
+  metadata.gz: cb35de07fb0f54d599c9cfe2873f463515a39a3bf85b98bfca74f054155fff85588c97b72363e31e86cbe18a8e86e1e926390f7711694438fd2d60b61f6f64b8
+  data.tar.gz: 91cdf4828952cfa27cc0478b85dc202237d483e035a5d462f41651a4205fd93709b7a92ca13941e5cc78a093dd47f98373ad4a2188f02a5f0123f00f9869163a

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+#### v0.3.0
+* Adding support for environment argument
+
+  > Brian Bergstrom: : https://github.com/sportngin/soyuz/pull/16
+
 #### v0.2.0
 * Adds the ability to set env variables for soyuz to use
 

data/README.md

@@ -33,6 +33,7 @@ environments:
           -
             display: "Deploy"
             cmd: "cap $SOYUZ_ENVIRONMENT deploy:rolling"
+            default: true
           -
             display: "Deploy with Migrations"
             cmd: "cap $SOYUZ_ENVIRONMENT deploy:rolling_migrations"
@@ -49,8 +50,9 @@ environments:
 
 ## Usage
 
+Interactive:
 ```bash
-bundle exec soyuz deploy
+soyuz deploy
 # => 1. production
 # => 2. staging
 1
@@ -71,7 +73,13 @@ post-deploy-notes
 # post all of your deploy notes somewhere useful
 ```
 
-## Deprications
+Non-interactive mode requires that you pass the environment argument and that all choices in your config have a default flagged.
+```bash
+soyuz --non_interactive deploy staging
+```
+
+
+## Deprecations
 
 `:deploy_cmd` has be depricated in favor of `:deploy_cmds` to better
 match the before_deploy_cmds and after_deploy_cmds symantics

data/bin/soyuz

@@ -16,6 +16,11 @@ DOCUMENTATION
     see Soyuz's GitHub repo: https://github.com/sportngin/soyuz
 """
 
+switch [:non_interactive], :desc => 'Non-interactive deploy using default choices.', :negatable => false
+pre do |global_options, command, options, args|
+  $non_interactive = global_options[:non_interactive]
+  true
+end
 
 desc "Check your config file to ensure it's valid"
 command 'check' do |c|
@@ -27,11 +32,12 @@ command 'check' do |c|
 end
 
 desc "Deploy your application"
+arg_name '<environment>'
 command 'deploy' do |c|
   c.flag [:c, :config], :desc => 'soyuz config file', :default_value => '.soyuz.yml'
   c.action do |global_options, options, args|
     options = global_options.merge(options)
-    Soyuz::Deploy.new(options[:config]).execute
+    Soyuz::Deploy.new(args.first, options).execute
   end
 end
 

data/lib/soyuz/command_choice.rb

@@ -6,13 +6,26 @@ module Soyuz
     def initialize(choices)
       raise ArgumentError, "Choices must be an array" unless choices.is_a?(Array)
       @choices = choices
+      @default_choice = default_choice_number
+      raise ArgumentError, "Default choice required for non interactive mode." if @default_choice.nil? && $non_interactive
     end
 
-    def run
+    def default_choice_number
       @choices.each_with_index do |choice, index|
-        say "#{index+1}) #{choice[:display]}"
+        return index+1 if choice[:default]
+      end
+      nil
+    end
+
+    def run
+      if @default_choice.nil?
+        @choices.each_with_index do |choice, index|
+          say "#{index+1}) #{choice[:display]}"
+        end
+        choice = ask("? ", Integer) { |q| q.in = 1..@choices.length }
+      else
+        choice = default_choice_number
       end
-      choice = ask("? ", Integer) { |q| q.in = 1..@choices.length }
       build_command(choice-1)
     end
 

data/lib/soyuz/config.rb

@@ -39,12 +39,11 @@ module Soyuz
     end
 
     def valid?
-      begin
-        File.exists?(@config_file) && config_data.is_a?(Hash)
-        environments.all?{|env| env.valid?}
-      rescue StandardError
-        false
-      end
+      File.exists?(@config_file) && config_data.is_a?(Hash)
+      environments.all?{|env| env.valid?}
+    rescue StandardError => e
+      puts e.message
+      false
     end
   end
   InvalidConfig = Class.new(StandardError)

data/lib/soyuz/deploy.rb

@@ -1,14 +1,15 @@
 require_relative 'config'
 module Soyuz
   class Deploy
-    def initialize(config_file)
-      @config = Config.new(config_file)
+    def initialize(env_name, options)
+      @config = Config.new(options[:config])
       @config.validate!
+      set_environment(env_name) if env_name || $non_interactive
     end
 
-
     def execute
-      choose_environment
+      choose_environment unless @environment
+      ENV['SOYUZ_ENVIRONMENT'] = @environment.name.to_s
       before_callbacks
       deploy
       after_callbacks
@@ -22,6 +23,11 @@ module Soyuz
       @config.environments
     end
 
+    def set_environment(env_name)
+      @environment = environments.detect { |env| env.name.to_s == env_name }
+      raise("Invalid environment '#{env_name}'.") unless @environment
+    end
+
     def choose_environment
       say "Choose an Environment: \n"
       environments.each_with_index do |environment, index|
@@ -29,7 +35,6 @@ module Soyuz
       end
       choice = ask("? ", Integer) { |q| q.in = 1..environments.length }
       @environment = environments[choice-1]
-      ENV['SOYUZ_ENVIRONMENT'] = @environment.name.to_s
     end
 
     def deploy

data/lib/soyuz/version.rb

@@ -1,3 +1,3 @@
 module Soyuz
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/files/{soyuz_example.yml → soyuz_incompatible.yml}

@@ -1,4 +1,4 @@
-# .soyuz.yml in the app you want to deploy with soyuz
+---
 defaults:
   deploy_cmd: 'echo default deploy $SOYUZ_ENVIRONMENT'
 

data/spec/files/soyuz_invalid.yml

@@ -0,0 +1 @@
+  cat:tacos-cat:eat;tacos-!@#$

data/spec/files/soyuz_non_interactive.yml

@@ -0,0 +1,25 @@
+---
+defaults:
+  deploy_cmds:
+  - 'echo default deploy $SOYUZ_ENVIRONMENT'
+
+environments:
+  -
+    production:
+      deploy_cmds:
+      -
+        -
+          display: "Deploy"
+          cmd: "echo deploying $SOYUZ_ENVIRONMENT "
+          default: true
+        -
+          display: "Deploy with Migrations"
+          cmd: "echo deploying with migrations $SOYUZ_ENVIRONMENT"
+
+      before_deploy_cmds:
+        - "echo before deploy callback"
+      after_deploy_cmds:
+        - "echo after deploy callback"
+  -
+    staging: {}
+

data/spec/files/soyuz_valid_legacy.yml

@@ -0,0 +1,22 @@
+---
+defaults:
+  deploy_cmd: 'echo default deploy $SOYUZ_ENVIRONMENT'
+
+environments:
+  -
+    production:
+      deploy_cmd:
+        -
+          display: "Deploy"
+          cmd: "echo deploying $SOYUZ_ENVIRONMENT "
+        -
+          display: "Deploy with Migrations"
+          cmd: "echo deploying with migrations $SOYUZ_ENVIRONMENT"
+
+      before_deploy_cmds:
+        - "echo before deploy callback"
+      after_deploy_cmds:
+        - "echo after deploy callback"
+  -
+    staging: {}
+

data/spec/files/soyuz_valid_modern.yml

@@ -0,0 +1,24 @@
+---
+defaults:
+  deploy_cmds:
+  - 'echo default deploy $SOYUZ_ENVIRONMENT'
+
+environments:
+  -
+    production:
+      deploy_cmds:
+      -
+        -
+          display: "Deploy"
+          cmd: "echo deploying $SOYUZ_ENVIRONMENT "
+        -
+          display: "Deploy with Migrations"
+          cmd: "echo deploying with migrations $SOYUZ_ENVIRONMENT"
+
+      before_deploy_cmds:
+        - "echo before deploy callback"
+      after_deploy_cmds:
+        - "echo after deploy callback"
+  -
+    staging: {}
+

data/spec/soyuz/config_spec.rb

@@ -2,22 +2,59 @@ require "spec_helper"
 require "soyuz/config"
 module Soyuz
   describe Config do
-    let(:valid_config){ "files/soyuz_example.yml" }
-    subject { Config.new(valid_config) }
-
     before do
-      allow(subject).to receive(:puts)
+      $non_interactive = false
     end
 
     context "#check" do
-      it "to raise an InvalidConfig error if the config is invalid" do
-        allow(subject).to receive(:valid?) { false }
-        expect{ subject.check }.to raise_error(InvalidConfig)
+      context "valid modern" do
+        subject { Config.new(CONFIG_PATHS[:valid_modern]) }
+        it "to not raise an error if the config is valid" do
+          expect(STDOUT).to receive(:puts).with("Config file is valid. We are go for launch.")
+          expect{ subject.check }.to_not raise_error
+        end
+        it "to raise an InvalidConfig error in non interactive mode" do
+          $non_interactive = true
+          expect(STDOUT).to receive(:puts).with("Default choice required for non interactive mode.")
+          expect{ subject.check }.to raise_error(InvalidConfig)
+        end
+      end
+
+      context "valid legacy" do
+        subject { Config.new(CONFIG_PATHS[:valid_legacy]) }
+
+        it "to not raise an error if the config is valid" do
+          expect(STDOUT).to receive(:puts).with("Config file is valid. We are go for launch.")
+          expect{ subject.check }.to_not raise_error
+        end
+      end
+
+      context "non interactive" do
+        subject { Config.new(CONFIG_PATHS[:non_interactive]) }
+        before do
+          $non_interactive = true
+        end
+
+        it "to not raise an error if the config is valid" do
+          expect(STDOUT).to receive(:puts).with("Config file is valid. We are go for launch.")
+          expect{ subject.check }.to_not raise_error
+        end
+      end
+
+      context "incompatible" do
+        subject { Config.new(CONFIG_PATHS[:incompatible]) }
+        it "to raise an InvalidConfig error if the config is invalid" do
+          expect(STDOUT).to receive(:puts).with("Only one definiton of deploy_cmd or deploy_cmds is allowed")
+          expect{ subject.check }.to raise_error(InvalidConfig)
+        end
       end
 
-      it "to not raise an error if the config is valid" do
-        allow(subject).to receive(:valid?) { true }
-        expect{ subject.check }.to_not raise_error
+      context "invalid" do
+        subject { Config.new(CONFIG_PATHS[:invalid]) }
+        it "to raise an InvalidConfig error if the config is invalid" do
+          expect(STDOUT).to receive(:puts).with(kind_of(String))
+          expect{ subject.check }.to raise_error(InvalidConfig)
+        end
       end
     end
   end

data/spec/soyuz/deploy_spec.rb

@@ -2,44 +2,47 @@ require "spec_helper"
 require "soyuz/deploy"
 module Soyuz
   describe Deploy do
-    let(:valid_config){ "files/soyuz_example.yml" }
-    subject { Deploy.new(valid_config) }
+    subject { Deploy.new(nil, config: CONFIG_PATHS[:valid_modern]) }
 
     before do
-      allow_any_instance_of(Config).to receive(:validate!)
+      $non_interactive = false
+      allow(ENV).to receive("[]=").with("SOYUZ_ENVIRONMENT", kind_of(String))
     end
 
     context "#execute" do
-      it "to ask for an environment" do
-        allow(subject).to receive(:before_callbacks)
-        allow(subject).to receive(:deploy)
-        allow(subject).to receive(:after_callbacks)
-        expect(subject).to receive(:choose_environment)
-        subject.execute
-      end
+      context "interactive" do
+        before do
+          allow_any_instance_of(Config).to receive(:validate!)
+          allow_any_instance_of(HighLine).to receive(:say)
+          allow_any_instance_of(HighLine).to receive(:ask) { 1 }
+        end
 
-      it "to call before callbacks" do
-        allow(subject).to receive(:choose_environment)
-        allow(subject).to receive(:deploy)
-        allow(subject).to receive(:after_callbacks)
-        expect(subject).to receive(:before_callbacks)
-        subject.execute
-      end
+        it "to ask for an environment" do
+          expect(subject).to receive(:choose_environment).and_call_original
+          allow(subject).to receive(:before_callbacks)
+          allow(subject).to receive(:deploy)
+          allow(subject).to receive(:after_callbacks)
+          subject.execute
+        end
 
-      it "to call deploy" do
-        allow(subject).to receive(:choose_environment)
-        allow(subject).to receive(:before_callbacks)
-        allow(subject).to receive(:after_callbacks)
-        expect(subject).to receive(:deploy)
-        subject.execute
-      end
+        it "to call deploy and callbacks" do
+          allow(subject).to receive(:choose_environment).and_call_original
+          expect(subject).to receive(:before_callbacks)
+          expect(subject).to receive(:deploy)
+          expect(subject).to receive(:after_callbacks)
+          subject.execute
+        end
 
-      it "to call after callbacks" do
-        allow(subject).to receive(:choose_environment)
-        allow(subject).to receive(:before_callbacks)
-        allow(subject).to receive(:deploy)
-        expect(subject).to receive(:after_callbacks)
-        subject.execute
+      end
+      context "non interactive" do
+        subject { Deploy.new("staging", config: CONFIG_PATHS[:non_interactive]) }
+        it "to not ask anything" do
+          expect(subject).to_not receive(:choose_environment)
+          expect(subject).to receive(:before_callbacks)
+          expect(subject).to receive(:deploy)
+          expect(subject).to receive(:after_callbacks)
+          subject.execute
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -21,3 +21,11 @@ RSpec.configure do |config|
   #     --seed 1234
   #config.order = 'random'
 end
+
+CONFIG_PATHS = {
+    valid_modern: File.expand_path("../files/soyuz_valid_modern.yml", __FILE__),
+    valid_legacy: File.expand_path("../files/soyuz_valid_legacy.yml", __FILE__),
+    non_interactive: File.expand_path("../files/soyuz_non_interactive.yml", __FILE__),
+    incompatible: File.expand_path("../files/soyuz_incompatible.yml", __FILE__),
+    invalid: File.expand_path("../files/soyuz_invalid.yml", __FILE__),
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soyuz
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Andy Fleener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -169,7 +169,11 @@ files:
 - lib/soyuz/support.rb
 - lib/soyuz/version.rb
 - soyuz.gemspec
-- spec/files/soyuz_example.yml
+- spec/files/soyuz_incompatible.yml
+- spec/files/soyuz_invalid.yml
+- spec/files/soyuz_non_interactive.yml
+- spec/files/soyuz_valid_legacy.yml
+- spec/files/soyuz_valid_modern.yml
 - spec/soyuz/command_choice_spec.rb
 - spec/soyuz/command_env_spec.rb
 - spec/soyuz/command_spec.rb
@@ -203,7 +207,11 @@ signing_key:
 specification_version: 4
 summary: The old trusty deployment toolkit
 test_files:
-- spec/files/soyuz_example.yml
+- spec/files/soyuz_incompatible.yml
+- spec/files/soyuz_invalid.yml
+- spec/files/soyuz_non_interactive.yml
+- spec/files/soyuz_valid_legacy.yml
+- spec/files/soyuz_valid_modern.yml
 - spec/soyuz/command_choice_spec.rb
 - spec/soyuz/command_env_spec.rb
 - spec/soyuz/command_spec.rb