soyuz 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd3caff53d1ac3465a10f1d59e22d45b951bd303
-  data.tar.gz: 4e9e9253a004283522f0d50db48df1c1186ac59b
+  metadata.gz: c53680db5dda2fb6c19772c76e4f59a657a2579f
+  data.tar.gz: 56cdcfb9e19379ba71cd46ed6c25bd8713191a43
 SHA512:
-  metadata.gz: d708cc3cccb3e5123f9a5c374980974ec6f42821c2af006bf6a9681ea2010f3e9893c73e1e30c5d22e09b937f2451a8b3bc269ebe618db5348603193c9f4a16d
-  data.tar.gz: c6981603c6e7e5afb331bf86ef3d765d993066c32e60cb9d456a66096713d69ba5635e60d6f8ffe873740a3ca421b470711cfcfa4f9e969d260fa038baf7c0a2
+  metadata.gz: bfd38427d3133f9a1480a8bf02efa392586935cb535602fad61df3c0bfe0a45f53f3592b7da71bc660fc3220ee9c2c7fae6a91255932a4801cc80d3b4324aa42
+  data.tar.gz: d008cd34a69fd1f4fcb7b77027c95c87c84e816ea139adf734a47e1804db545220d325faf6bbac0913d73ddcb853a4ccabcdb8b54b75684a728d4f52badd8991

data/.octopolo.yml

@@ -0,0 +1,4 @@
+github_repo: sportngin/soyuz
+semantic_versioning: true
+branches_to_keep:
+  - master

data/.soyuz.yml

@@ -0,0 +1,13 @@
+defaults:
+  deploy_cmd: gem push *.gem
+  before_deploy_cmds:
+    - op tag-release
+    - sed -i '' -e "s/\".*/\"$(git tag | tail -1 | sed s/v//)\"/" lib/soyuz/version.rb
+    - git add  lib/soyuz/version.rb
+    - git commit -m "Version Bump" && git push
+    - gem build soyuz.gemspec
+  after_deploy_cmds:
+    - rm *.gem
+environments:
+  -
+    rubygems: {}

data/CHANGELOG.markdown

@@ -0,0 +1,11 @@
+#### v0.1.0
+#### v0.1.0
+
+* Exit status non zero
+
+  > Nick LaMuro: Ian Ehlert: https://github.com/sportngin/soyuz/pull/11
+
+* Soyuz support class for helper methods
+
+  > Nick LaMuro: Andy Fleener: https://github.com/sportngin/soyuz/pull/10
+

data/README.md

@@ -21,20 +21,22 @@ Or install it yourself as:
 ```yaml
 # .soyuz.yml in the app you want to deploy with soyuz
 defaults:
-  deploy_cmd: 'opsicle deploy $SOYUZ_ENVIRONMENT'
-  
-    
+  deploy_cmds:
+    - 'opsicle deploy $SOYUZ_ENVIRONMENT'
+
+
 environments:
-  - 
+  -
     production:
-      deploy_cmd: 
-        -
-          display: "Deploy"
-          cmd: "cap $SOYUZ_ENVIRONMENT deploy:rolling"
+      deploy_cmds:
         -
-          display: "Deploy with Migrations"
-          cmd: "cap $SOYUZ_ENVIRONMENT deploy:rolling_migrations"
- 
+          -
+            display: "Deploy"
+            cmd: "cap $SOYUZ_ENVIRONMENT deploy:rolling"
+          -
+            display: "Deploy with Migrations"
+            cmd: "cap $SOYUZ_ENVIRONMENT deploy:rolling_migrations"
+
       before_deploy_cmds:
         - accept-pull
         - tag-release
@@ -69,6 +71,11 @@ post-deploy-notes
 # post all of your deploy notes somewhere useful
 ```
 
+## Deprications
+
+`:deploy_cmd` has be depricated in favor of `:deploy_cmds` to better
+match the before_deploy_cmds and after_deploy_cmds symantics
+
 ## Contributing
 
 1. Fork it ( http://github.com/sportngin/soyuz/fork )

data/lib/soyuz.rb

@@ -3,5 +3,4 @@ require "soyuz/config"
 require "soyuz/deploy"
 
 module Soyuz
-  # Your code goes here...
 end

data/lib/soyuz/command.rb

@@ -9,12 +9,13 @@ module Soyuz
     end
 
     def self.build(cmd)
-     cmd.is_a?(Array) ? CommandChoice.new(cmd) : new(cmd)
+      return if cmd.nil? || cmd.empty?
+      cmd.is_a?(Array) ? CommandChoice.new(cmd) : new(cmd)
     end
 
     def run
       say("<%= color('executing [#{@cmd}]...', :green) %>")
-      system(@cmd)
+      exit(false) unless system(@cmd)
     end
   end
 end

data/lib/soyuz/command_choice.rb

@@ -1,6 +1,8 @@
 require_relative "command"
+
 module Soyuz
   class CommandChoice
+
     def initialize(choices)
       raise ArgumentError, "Choices must be an array" unless choices.is_a?(Array)
       @choices = choices
@@ -11,7 +13,7 @@ module Soyuz
         say "#{index+1}) #{choice[:display]}"
       end
       choice = ask("? ", Integer) { |q| q.in = 1..@choices.length }
-      Command.new(@choices[choice-1][:cmd]).run
+      Command.build(@choices[choice-1][:cmd]).run
     end
   end
 end

data/lib/soyuz/config.rb

@@ -1,7 +1,11 @@
 require 'safe_yaml'
 require_relative 'environment'
+require_relative 'support'
+
 module Soyuz
   class Config
+    include Soyuz::Support
+
     def initialize(config_file)
       @config_file = config_file
     end
@@ -37,27 +41,11 @@ module Soyuz
     def valid?
       begin
         File.exists?(@config_file) && config_data.is_a?(Hash)
+        environments.all?{|env| env.valid?}
       rescue StandardError
         false
       end
     end
-
-    def symbolize_keys(hash)
-      return hash unless hash.is_a?(Hash)
-      hash.inject({}){|result, (key, value)|
-        new_key = case key
-                  when String then key.to_sym
-                  else key
-                  end
-        new_value = case value
-                    when Hash then symbolize_keys(value)
-                    when Array then value.map{|el| symbolize_keys(el) }
-                    else value
-                    end
-        result[new_key] = new_value
-        result
-      }
-    end
   end
   InvalidConfig = Class.new(StandardError)
 end

data/lib/soyuz/environment.rb

@@ -1,11 +1,22 @@
 require_relative 'command'
+
 module Soyuz
   class Environment
     def initialize(attributes={}, defaults={})
       set_attributes(attributes, defaults)
+
+      if [:deploy_cmds, :deploy_cmd].all?{ |attr| @attributes.has_key?(attr) }
+        raise ArgumentError, "Only one definiton of deploy_cmd or deploy_cmds is allowed"
+      end
+
       build
     end
 
+    def valid?
+      # If the environment built then it's valid
+      true
+    end
+
     def before_callbacks
       @before_callbacks.each do|cmd|
         cmd.run
@@ -19,7 +30,9 @@ module Soyuz
     end
 
     def deploy
-      @deploy_cmd.run
+      @deploy_cmds.each do |cmd|
+        cmd.run
+      end
     end
 
     def name
@@ -34,7 +47,9 @@ module Soyuz
     end
 
     def build
-      @deploy_cmd = Command.build(@attributes[:deploy_cmd])
+      # deploy_cmd is deprecated and will be removed in a future version
+      @deploy_cmds = Array(Command.build(@attributes[:deploy_cmd]))
+      @deploy_cmds += Array(@attributes[:deploy_cmds]).compact.map{|cmd| Command.build(cmd) }
       @before_callbacks = Array(@attributes[:before_deploy_cmds]).compact.map{|cmd| Command.build(cmd) }
       @after_callbacks = Array(@attributes[:after_deploy_cmds]).compact.map{|cmd| Command.build(cmd) }
     end

data/lib/soyuz/support.rb

@@ -0,0 +1,27 @@
+module Soyuz
+  module Support
+
+    private
+
+    def symbolize_keys(objekt)
+      case objekt
+      when Hash then symbolize_hash(objekt)
+      when Array then symbolize_array(objekt)
+      else objekt
+      end
+    end
+
+    def symbolize_hash(hash)
+      hash.inject({}) do |result, (key, value)|
+        new_key         = key.to_sym rescue key
+        result[new_key] = symbolize_keys(value)
+        result
+      end
+    end
+
+    def symbolize_array(array)
+      array.map {|val| symbolize_keys(val)}
+    end
+
+  end
+end

data/lib/soyuz/version.rb

@@ -1,3 +1,3 @@
 module Soyuz
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/files/soyuz_example.yml

@@ -12,6 +12,9 @@ environments:
         -
           display: "Deploy with Migrations"
           cmd: "echo deploying with migrations $SOYUZ_ENVIRONMENT"
+      deploy_cmds:
+        - "echo deploy command 1"
+        - "echo deploy command 2"
 
       before_deploy_cmds:
         - "echo before deploy callback"

data/spec/soyuz/command_choice_spec.rb

@@ -15,13 +15,27 @@ module Soyuz
     end
 
     context "#run" do
+
       it "creates a command for the given choice" do
         expect(subject).to receive(:say).with("1) choice1").once
         expect(subject).to receive(:say).with("2) choice2").once
         expect(subject).to receive(:ask).with(instance_of(String), Integer).and_return(1).once
-        expect(Command).to receive(:new).with("echo choice1").and_return(command_double)
+        expect(Command).to receive(:build).with("echo choice1").and_return(command_double)
         subject.run
       end
+
+      context "Nested choices" do
+        let(:nested_choices) { [{display: "choice1.1", cmd: "echo choice1.1"}, {display: "choice1.2", cmd: "echo choice1.2" }] }
+        let(:choices){ [{display: "choice1", cmd: nested_choices }, {display: "choice2", cmd: "echo choice2" }] }
+
+        it "creates a command for the given choice" do
+          expect(subject).to receive(:say).with("1) choice1").once
+          expect(subject).to receive(:say).with("2) choice2").once
+          expect(subject).to receive(:ask).with(instance_of(String), Integer).and_return(1).once
+          expect(Command).to receive(:build).with(nested_choices).and_return(command_double)
+          subject.run
+        end
+      end
     end
 
   end

data/spec/soyuz/command_spec.rb

@@ -18,8 +18,16 @@ module Soyuz
     end
 
     context "#run" do
+      before(:each) { allow(subject).to receive(:say) }
+
       it "to make a system call" do
+        expect(subject).to receive(:system).and_return(true)
+        subject.run
+      end
+
+      it "exits if the command returns a non-zero exist status" do
         expect(subject).to receive(:system)
+        expect(subject).to receive(:exit)
         subject.run
       end
     end

data/spec/soyuz/environment_spec.rb

@@ -2,51 +2,64 @@ require 'spec_helper'
 require 'soyuz/environment'
 module Soyuz
   describe Environment do
-    let(:attributes){ {environment: {deploy_cmd: "echo derp", before_deploy_cmds: ['echo before', 'echo more before'], after_deploy_cmds: ['echo after', 'echo another after']}} }
+    let(:attributes){ {environment: {deploy_cmds: ["echo herp", "echo blarg"], before_deploy_cmds: ['echo before', 'echo more before'], after_deploy_cmds: ['echo after', 'echo another after']}} }
     subject{ Environment.new(attributes) }
     let(:cmd){ double("Command") }
 
     context ".new" do
+
       subject{ Environment }
+
+      context "invalid deploy command" do
+
+        let(:attributes){ {environment: {deploy_cmd: "echo derp", deploy_cmds: ["echo herp", "echo blarg"], before_deploy_cmds: ['echo before', 'echo more before'], after_deploy_cmds: ['echo after', 'echo another after']}} }
+
+        it "Rasies an invalid configuration error if both deploy_cmd and deploy_cmds are defined" do
+          expect{ subject.new(attributes) }.to raise_error(ArgumentError)
+        end
+
+      end
+
       it "sets the environment name" do
         expect(subject.name).to_not be_nil
         subject.new(attributes)
       end
-      it "sets the attributes" do
-        allow_any_instance_of(subject).to receive(:build)
-        expect_any_instance_of(subject).to receive(:set_attributes)
-        subject.new(attributes)
-      end
 
       it "builds the environment" do
-        allow_any_instance_of(subject).to receive(:set_attributes)
         expect_any_instance_of(subject).to receive(:build)
         subject.new(attributes)
       end
+
     end
 
     context "#deploy" do
+
       it "runs the deploy command" do
         allow(Command).to receive(:new).and_return(cmd)
-        expect(cmd).to receive(:run)
+        expect(cmd).to receive(:run).exactly(2).times
         subject.deploy
       end
+
     end
 
     context "#before_callbacks" do
+
       it "runs all of the before callbacks" do
         allow(Command).to receive(:new).and_return(cmd)
         expect(cmd).to receive(:run).twice
         subject.before_callbacks
       end
+
     end
 
     context "#after_callbacks" do
+
       it "runs all of the after callbacks" do
         allow(Command).to receive(:new).and_return(cmd)
         expect(cmd).to receive(:run).twice
         subject.after_callbacks
       end
+
     end
   end
 end

data/spec/soyuz/support_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+require 'soyuz/support'
+
+describe Soyuz::Support do
+
+  let(:soyuz_class) { Class.new { include Soyuz::Support }.new }
+
+  describe "#symbolize_keys" do
+    context "for a hash" do
+      subject { {'foo' => 'bar'} }
+
+      it "converts all the keys to symbols" do
+        new_keys = soyuz_class.send(:symbolize_keys, subject).keys
+        expect(new_keys).to eq([:foo])
+      end
+    end
+
+    context "for a hash with a hash for a value" do
+      subject { {'foo' => {'bar' => 'baz'}} }
+
+      it "converts all the keys nested in the array" do
+        value_keys = soyuz_class.send(:symbolize_keys, subject).values.first.keys
+        expect(value_keys).to eq([:bar])
+      end
+    end
+
+    context "for a hash with an array for a value" do
+      subject { {'foo' => [{'bar' => 'baz'}]} }
+
+      it "converts all the keys nested in the array" do
+        array_keys = soyuz_class.send(:symbolize_keys, subject).values.first.first.keys
+        expect(array_keys).to eq([:bar])
+      end
+    end
+
+    context "with a non-string/non-symbol key" do
+      subject { {1 => 2} }
+
+      it "does not convert the key" do
+        new_keys = soyuz_class.send(:symbolize_keys, subject).keys
+        expect(new_keys).to eq([1])
+      end
+    end
+
+    context "when a non-hash is passed in" do
+      subject { [1,2] }
+
+      it "does not convert the key" do
+        result = soyuz_class.send(:symbolize_keys, subject)
+        expect(result).to eq([1, 2])
+      end
+    end
+
+    context "with a hash nested in an array" do
+      subject { [{'foo' => 'bar'}] }
+
+      it "it converts the keys" do
+        result = soyuz_class.send(:symbolize_keys, subject)
+        expect(result).to eq([{:foo => 'bar'}])
+      end
+    end
+
+    context "with a hash deeply nested in multiple arrays" do
+      subject { [[[{'foo' => 'bar'}]]] }
+
+      it "it converts the keys" do
+        result = soyuz_class.send(:symbolize_keys, subject)
+        expect(result).to eq([[[{:foo => 'bar'}]]])
+      end
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soyuz
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Andy Fleener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -146,10 +146,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".octopolo.yml"
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".soyuz.yml"
 - ".travis.yml"
+- CHANGELOG.markdown
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -162,6 +165,7 @@ files:
 - lib/soyuz/config.rb
 - lib/soyuz/deploy.rb
 - lib/soyuz/environment.rb
+- lib/soyuz/support.rb
 - lib/soyuz/version.rb
 - soyuz.gemspec
 - spec/files/soyuz_example.yml
@@ -170,6 +174,7 @@ files:
 - spec/soyuz/config_spec.rb
 - spec/soyuz/deploy_spec.rb
 - spec/soyuz/environment_spec.rb
+- spec/soyuz/support_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/sportngin/soyuz
 licenses:
@@ -202,4 +207,5 @@ test_files:
 - spec/soyuz/config_spec.rb
 - spec/soyuz/deploy_spec.rb
 - spec/soyuz/environment_spec.rb
+- spec/soyuz/support_spec.rb
 - spec/spec_helper.rb