opsicle 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 382eb43575e7839130f2b9aeb764eb073f00eb55
-  data.tar.gz: d2daa070bd8e667242c07655c9c9fe2f615a1a6b
+  metadata.gz: c70b5f91d3917104411e5e0b6cc183406b1b8016
+  data.tar.gz: 61418c77bb81f7adccd36dfed093ea482e59077c
 SHA512:
-  metadata.gz: 2e3f9d74f4a3e204639c113564faae10f2714f7347a348044de701da4573fb76a915097ea482cc0c81d7b6d9d71365705b0ad11a10e8d16a1f52b10d43a970b4
-  data.tar.gz: eaf95944a7eaa244811546b382e5c1b05ed4cdd9522290e93f353173ad2adf97727dcf46db1c7a7c396e7da154189e39cec13387720c7e39eface42f2e0c57fb
+  metadata.gz: 39ceb8570c356e6a74411a4f5307771ee7cfc1bddb9ddb958d26209a3a8366225c8f5e8d695b075be0b2744a472acd35cb74eade46841f29bd5cd65b98d8a5b4
+  data.tar.gz: d1322f7a77cfb0c3e5e416fe9a7d3632a13908704f9a0e1d32adcdb8969705d4c50c04de01653f19c6aedb0bfcda659ec1c1b1be0db89f4034c545979996b869

data/bin/opsicle

@@ -2,6 +2,8 @@
 require 'rubygems'
 require 'gli'
 require 'opsicle'
+require 'json'
+require 'yaml'
 
 include GLI::App
 
@@ -181,4 +183,29 @@ command :instances do |c|
   end
 end
 
+
+desc "Update properties on a OpsWorks resource."
+arg_name '<environment> <type>'
+command 'update' do |c|
+  valid_types = %w[app elastic_ip instance layer my_user_profile rds_db_instance stack user_profile volume]
+  c.flag   [:j, :json],         :desc => 'JSON of values to update.', :type => String
+  c.flag   [:y, :yaml_file],    :desc => 'YAML file of values to update.', :type => String
+
+  c.action do |global_options, options, args|
+    raise ArgumentError, "Environment is required" unless args.first
+    raise ArgumentError, "Resource type is required" unless args[1]
+    raise ArgumentError, "Invalid type: #{args[1]}.  Valid types: #{valid_types}" unless valid_types.include?(args[1])
+    if options[:json]
+      values = JSON.parse(options[:json])
+    elsif options[:yaml_file]
+      yaml_file = File.expand_path(options[:yaml_file])
+      values = YAML.load_file(yaml_file)
+    else
+      raise ArgumentError, "Values required in JSON or YAML flag."
+    end
+
+    Opsicle::Update.new(*args).execute(values, global_options.merge(options))
+  end
+end
+
 exit run(ARGV)

data/lib/opsicle/commands.rb

@@ -5,6 +5,7 @@ require "opsicle/commands/chef_update"
 require "opsicle/commands/execute_recipes"
 require "opsicle/commands/list"
 require "opsicle/commands/list_instances"
+require "opsicle/commands/update"
 require "opsicle/commands/ssh"
 require "opsicle/commands/ssh_key"
 require "opsicle/commands/ssh_clean_keys"

data/lib/opsicle/commands/update.rb

@@ -0,0 +1,57 @@
+require 'hashdiff'
+require 'opsicle/output'
+
+module Opsicle
+  class Update
+    attr_reader :client, :type
+
+    def initialize(environment, type)
+      @client = Client.new(environment)
+      @type = type
+    end
+
+    def execute(values, options)
+      before = describe
+      update(values)
+      after = describe
+      print(before, after)
+    end
+
+    def describe
+      api_method = "describe_#{@type}s"
+      api_opts = {
+          :"#{@type}_ids" => [client.config.opsworks_config[:"#{@type}_id"]]
+      }
+      client.api_call(api_method, api_opts)[:"#{@type}s"][0]
+    end
+
+    def update(values)
+      api_method = "update_#{@type}"
+      api_opts = values.merge(:"#{@type}_id" => client.config.opsworks_config[:"#{@type}_id"])
+      client.api_call(api_method, api_opts)
+    end
+
+    def print(before, after)
+      diff = HashDiff.diff(before, after)
+      Output.say("Changes: #{diff.size}")
+      Output.terminal.say(Terminal::Table.new headings: %w[Change Key Before After], rows: format_diff(diff)) if diff.size > 0
+    end
+
+    def format_diff(diff)
+      diff.map { |change|
+        case change[0]
+          when '-'
+            change.insert(3, nil)
+            change.map! { |i| Output.format(i, :removal) }
+          when '+'
+            change.insert(2, nil)
+            change.map! { |i| Output.format(i, :addition) }
+          when '~'
+            change.map! { |i| Output.format(i, :modification) }
+        end
+        change
+      }
+    end
+
+  end
+end

data/lib/opsicle/output.rb

@@ -15,14 +15,21 @@ module Opsicle
           :verbose => [:bold, :magenta],
           :debug => [:bold, :cyan],
           :success => [:bold, :green],
+          :addition => [:bold, :green],
+          :removal => [:bold, :red],
+          :modification => [:bold, :yellow],
       )
     end
 
     def self.say(msg, log_style=:normal)
+      terminal.say format(msg, log_style)
+    end
+
+    def self.format(msg, log_style=:normal)
       if $color
-        terminal.say "<%= color('#{msg}', '#{log_style}') %>"
+        terminal.color(msg.to_s, log_style)
       else
-        terminal.say msg
+        msg
       end
     end
 

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/spec/opsicle/commands/update_spec.rb

@@ -0,0 +1,71 @@
+require "spec_helper"
+require "opsicle"
+
+module Opsicle
+  describe Update do
+    subject { Update.new("env", "type") }
+    let(:client) { double }
+    let(:env) { "env" }
+    let(:type) { "type" }
+    let(:values) { { :foo => "bar" } }
+
+    before do
+      allow(Client).to receive(:new).with('env') { client }
+      allow(client).to receive_message_chain("config.opsworks_config.[]") { 123 }
+    end
+
+    context "#execute" do
+      it "should update and print results" do
+        allow(subject).to receive(:describe) { "tacos" }
+        expect(subject).to receive(:print).with("tacos", "tacos")
+        api_opts = values.merge(:type_id => 123)
+        expect(client).to receive(:api_call).with("update_type", api_opts)
+        subject.execute(values, api_opts)
+      end
+    end
+
+    context "#describe" do
+      it "should return data for type" do
+        expect(client).to receive(:api_call).with("describe_types", :type_ids => [123]).and_return(:types => [])
+        subject.describe
+      end
+    end
+
+    context "#update" do
+      it "should update values for type" do
+        api_opts = values.merge(:type_id => 123)
+        expect(client).to receive(:api_call).with("update_type", api_opts)
+        subject.update(values)
+      end
+    end
+
+    context "#print" do
+      it "should print no changes without table" do
+        allow(HashDiff).to receive(:diff) { [] }
+        expect(Output).to receive(:say).with("Changes: 0") { nil }
+        expect(Output).to_not receive(:terminal)
+        subject.print(nil, nil)
+      end
+      it "should print changes with table" do
+        allow(HashDiff).to receive(:diff) { [%w[- nyan 1], %w[+ cat 2],%w[~ taco 3 4]] }
+        expect(Output).to receive(:say).with("Changes: 3") { nil }
+        expect(Output).to receive_message_chain("terminal.say")
+        subject.print(nil, nil)
+      end
+    end
+
+    context "#format_diff" do
+      let(:diff) { [%w[- nyan 1], %w[+ cat 2],%w[~ taco 3 4]] }
+      let(:formatted_diff) {
+        [%w[r- rnyan r1 r], %w[a+ acat a a2], %w[m~ mtaco m3 m4]]
+      }
+
+      it "should align columns and colorize" do
+        allow(Output).to receive(:format).with(anything, :removal) { |arg| "r#{arg}"}
+        allow(Output).to receive(:format).with(anything, :addition) { |arg| "a#{arg}"}
+        allow(Output).to receive(:format).with(anything, :modification) { |arg| "m#{arg}"}
+        expect(subject.format_diff(diff)).to eq(formatted_diff)
+      end
+    end
+  end
+end

data/spec/opsicle/output_spec.rb

@@ -0,0 +1,61 @@
+require "spec_helper"
+require "opsicle"
+
+module Opsicle
+  describe Output do
+    subject { Output }
+    let(:terminal) { double(:say => nil, :color => nil) }
+    let(:msg) { "message" }
+    let(:colored_msg) { "COLOURmessageCOLOUR" }
+
+    before do
+      allow(subject).to receive(:terminal).and_return(terminal)
+      $color = true
+      $verbose = false
+    end
+
+    context "#say" do
+      it "should say a formatted message" do
+        allow(terminal).to receive(:color).and_return(colored_msg)
+        expect(terminal).to receive(:say).with(colored_msg)
+        subject.say(msg)
+      end
+      it "should say a message without color" do
+        $color = false
+        expect(terminal).to receive(:say).with(msg)
+        subject.say(msg)
+      end
+    end
+
+    context "#format" do
+      it "should color message" do
+        allow(terminal).to receive(:color).and_return(colored_msg)
+        expect(subject.format(msg)).to eq(colored_msg)
+      end
+      it "should not color message" do
+        $color = false
+        expect(subject.format(msg)).to eq(msg)
+      end
+    end
+
+    context "#say_verbose" do
+      it "should not say a verbose message" do
+        expect(terminal).to_not receive(:say)
+        subject.say_verbose(msg)
+      end
+      it "should say a verbose message" do
+        $verbose = true
+        expect(terminal).to receive(:say)
+        subject.say_verbose(msg)
+      end
+    end
+
+    context "#ask" do
+      it "should ask" do
+        expect(terminal).to receive(:ask)
+        subject.ask
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -95,6 +95,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: hashdiff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +200,7 @@ files:
 - lib/opsicle/commands/ssh.rb
 - lib/opsicle/commands/ssh_clean_keys.rb
 - lib/opsicle/commands/ssh_key.rb
+- lib/opsicle/commands/update.rb
 - lib/opsicle/config.rb
 - lib/opsicle/deploy_helper.rb
 - lib/opsicle/deployment.rb
@@ -218,6 +233,7 @@ files:
 - spec/opsicle/commands/list_spec.rb
 - spec/opsicle/commands/ssh_key_spec.rb
 - spec/opsicle/commands/ssh_spec.rb
+- spec/opsicle/commands/update_spec.rb
 - spec/opsicle/config_spec.rb
 - spec/opsicle/errors_spec.rb
 - spec/opsicle/instances_spec.rb
@@ -227,6 +243,7 @@ files:
 - spec/opsicle/monitor/screen_spec.rb
 - spec/opsicle/monitor/spy/deployments_spec.rb
 - spec/opsicle/monitor/subpanel_spec.rb
+- spec/opsicle/output_spec.rb
 - spec/opsicle/s3_bucket_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/sportngin/opsicle
@@ -262,6 +279,7 @@ test_files:
 - spec/opsicle/commands/list_spec.rb
 - spec/opsicle/commands/ssh_key_spec.rb
 - spec/opsicle/commands/ssh_spec.rb
+- spec/opsicle/commands/update_spec.rb
 - spec/opsicle/config_spec.rb
 - spec/opsicle/errors_spec.rb
 - spec/opsicle/instances_spec.rb
@@ -271,5 +289,6 @@ test_files:
 - spec/opsicle/monitor/screen_spec.rb
 - spec/opsicle/monitor/spy/deployments_spec.rb
 - spec/opsicle/monitor/subpanel_spec.rb
+- spec/opsicle/output_spec.rb
 - spec/opsicle/s3_bucket_spec.rb
 - spec/spec_helper.rb