soyuz 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0b3f776b8602c0188eac78cc5ad4fdbde9547e2
-  data.tar.gz: c28b7bc7c6be22d1ee670d7537c08c09068c375c
+  metadata.gz: 59015ed20e3495f427c78b40f2846156ec4f5635
+  data.tar.gz: 8c25a79206d5a813d5b1f5507ae62de364d4fa60
 SHA512:
-  metadata.gz: bae0502bb608b6cb73543f0036207e3aee10ae4ed448271fe0be9834ff28d77ed3bc210c804e89317878534a8e47aad147956d7ab09c9021cc549dc681ab8eac
-  data.tar.gz: 7b451c9d74db0e2982dcd49d51772480098baa9b1be1571c81570d930745ac7569ffba9f90dd0430c61e26ba11ff661dc37dd18c619bee4c9259bdbe5db69bae
+  metadata.gz: 4d46c3f96343aa2da24b52830a4cac00250c11b299f9b10dbece7176252f898700196eaa6711cf5ae3de6e9329c9de2f455e8fe6cfb6dbd915dc433ae6b7b617
+  data.tar.gz: 3b398f211d1d670e8994a7c9a1237f3992aff052d5f358c783151731de5de9611a4077547f89a3f3cf19e9521325754cc87160b7b841b244e78b1c274c5f7ba6

data/CHANGELOG.markdown

@@ -1 +1,6 @@
+#### v0.2.0
+* Adds the ability to set env variables for soyuz to use
+
+  > Nick LaMuro: Andy Fleener: https://github.com/sportngin/soyuz/pull/13
+
 #### v0.1.1

data/lib/soyuz/command.rb

@@ -1,5 +1,6 @@
 require 'highline/import'
 require_relative 'command_choice'
+require_relative 'command_env'
 
 module Soyuz
   class Command
@@ -10,7 +11,14 @@ module Soyuz
 
     def self.build(cmd)
       return if cmd.nil? || cmd.empty?
-      cmd.is_a?(Array) ? CommandChoice.new(cmd) : new(cmd)
+
+      if cmd.is_a?(Array)
+        CommandChoice.new(cmd)
+      elsif cmd.is_a?(Hash)
+        CommandEnv.new(cmd)
+      else
+        new(cmd)
+      end
     end
 
     def run

data/lib/soyuz/command_choice.rb

@@ -13,7 +13,11 @@ module Soyuz
         say "#{index+1}) #{choice[:display]}"
       end
       choice = ask("? ", Integer) { |q| q.in = 1..@choices.length }
-      Command.build(@choices[choice-1][:cmd]).run
+      build_command(choice-1)
+    end
+
+    def build_command(choice)
+      Command.build(@choices[choice][:cmd]).run
     end
   end
 end

data/lib/soyuz/command_env.rb

@@ -0,0 +1,20 @@
+require 'highline/import'
+
+module Soyuz
+  class CommandEnv
+
+    NotHashMsg = "Environment Commands must be a Hash"
+    BadKeysMsg = "Environment Commands must contain :env_var and :env_val keys"
+
+    def initialize(cmd)
+      raise ArgumentError, NotHashMsg unless cmd.is_a?(Hash)
+      raise ArgumentError, BadKeysMsg unless cmd.has_key?(:env_var) && cmd.has_key?(:env_val)
+      @cmd = cmd
+    end
+
+    def run
+      ENV[@cmd[:env_var]] = @cmd[:env_val]
+    end
+
+  end
+end

data/lib/soyuz/version.rb

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

data/spec/soyuz/command_choice_spec.rb

@@ -2,11 +2,12 @@ require "spec_helper"
 require "soyuz/command_choice"
 module Soyuz
   describe CommandChoice do
-    let(:choices){ [{display: "choice1", cmd: "echo choice1"}, {display: "choice2", cmd: "echo choice2" }] }
-    let(:command_double){ instance_double("Command", :run => true) }
+    let(:choices) { [{display: "choice1", cmd: "echo choice1"}, {display: "choice2", cmd: "echo choice2" }] }
+    let(:command_double) { instance_double("Command", :run => true) }
+
     subject { CommandChoice.new(choices) }
 
-    context "choices isn't an array" do
+    describe "choices isn't an array" do
       let(:choices) { "I'm a command" }
       subject { CommandChoice }
       it "raises an error" do
@@ -14,29 +15,37 @@ module Soyuz
       end
     end
 
-    context "#run" do
+    describe "#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(:build).with("echo choice1").and_return(command_double)
+        expect(subject).to receive(:build_command).with(0).once
         subject.run
       end
 
-      context "Nested choices" do
+    end
+
+    describe "#build_command" do
+      context "with a single command" do
+        it "builds and runs the command" do
+          expect(Command).to receive(:build).with("echo choice1").and_return(command_double)
+          expect(command_double).to receive(:run)
+          subject.build_command(0)
+        end
+      end
+
+      context "with 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
+        it "builds and runs the commands" do
           expect(Command).to receive(:build).with(nested_choices).and_return(command_double)
-          subject.run
+          expect(command_double).to receive(:run)
+          subject.build_command(0)
         end
       end
     end
-
   end
 end

data/spec/soyuz/command_env_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+require "soyuz/command_env"
+
+module Soyuz
+  describe CommandEnv do
+    let(:cmd){ { :env_var => "FOO", :env_val => "BAR" } }
+    subject { CommandEnv.new(cmd) }
+
+    before do
+      allow(subject).to receive(:puts)
+    end
+
+    it "sets the command" do
+      expect(subject.instance_variable_get(:@cmd)).to eq(cmd)
+    end
+
+    context "cmd isn't a hash" do
+      let(:cmd) { 1234 }
+      subject { CommandEnv }
+      it "raises an error" do
+        expect{ subject.new(cmd) }.to raise_error(ArgumentError, "Environment Commands must be a Hash")
+      end
+    end
+
+    context "cmd doesn't contain :env_var and :env_val" do
+      let(:cmd) { {} }
+      subject { CommandEnv }
+      it "raises an error" do
+        expect{ subject.new(cmd) }.to raise_error(ArgumentError, "Environment Commands must contain :env_var and :env_val keys")
+      end
+    end
+
+    describe "#run" do
+      before { @old_env = ENV.dup }
+
+      it "sets the environment_variable" do
+        subject.run
+        expect(ENV["FOO"]).to eq("BAR")
+      end
+
+      after { ENV = @old_env }
+    end
+  end
+end

data/spec/soyuz/command_spec.rb

@@ -50,6 +50,16 @@ module Soyuz
           subject.build(cmd)
         end
       end
+
+      context "cmd is a env command" do
+        let(:cmd) { {:env_var => "FOO", :env_val => "BAR" } }
+        subject { Command }
+
+        it "sets the ENV based off of the :env_var and :env_val" do
+          expect(CommandEnv).to receive(:new).with(cmd)
+          subject.build(cmd)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soyuz
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andy Fleener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -162,6 +162,7 @@ files:
 - lib/soyuz.rb
 - lib/soyuz/command.rb
 - lib/soyuz/command_choice.rb
+- lib/soyuz/command_env.rb
 - lib/soyuz/config.rb
 - lib/soyuz/deploy.rb
 - lib/soyuz/environment.rb
@@ -170,6 +171,7 @@ files:
 - soyuz.gemspec
 - spec/files/soyuz_example.yml
 - spec/soyuz/command_choice_spec.rb
+- spec/soyuz/command_env_spec.rb
 - spec/soyuz/command_spec.rb
 - spec/soyuz/config_spec.rb
 - spec/soyuz/deploy_spec.rb
@@ -203,6 +205,7 @@ summary: The old trusty deployment toolkit
 test_files:
 - spec/files/soyuz_example.yml
 - spec/soyuz/command_choice_spec.rb
+- spec/soyuz/command_env_spec.rb
 - spec/soyuz/command_spec.rb
 - spec/soyuz/config_spec.rb
 - spec/soyuz/deploy_spec.rb