opsicle 0.2.1 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTQxYzNhNDc2ODIzNjhiZjBjMTZjZmE4M2EwZmYxOGIyMDQ0YTY2Yg==
+    ZjljYjQ5NzE0M2NhZDU3MWM2MTdjYjFjNzY2NzQ4MmU1MzU2YmE3OA==
   data.tar.gz: !binary |-
-    MGU2ODEzNzlkODk2MzI5NzljMTQyOTAxYzE4YThkMjgzY2I3YmY4NA==
+    NzQxZmI2NTY1MGVjZjIzMjA2NzdjNWRhZjFkMDQxMDUzZTFhZDYyOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDAwMDQ2Y2FkZGY0NjcwZGQ5MzQ1NGYwYTg5MjI3MDVjOGYxMjMzYTViMWVi
-    ZDVhYWEzOGE3NWQ1NzcxNGUxZTE5OTZhNmFlNDc2Y2ViNTQzMGI3MGZmNjEy
-    N2EyMDZmNjA5MDkxOGNkNmFmNGU2N2Y5MmY1MjBjMDI5ZWFkYjE=
+    OTAzMjJiODFkMjVjZDc5MTYyMGU4NTg4YzdlMjM2YmJjNmRjMTcyYTBlZDY1
+    MjVhNWNiOWU1NjljZjAzOGZhZTk5NjBhMDE0NThkNDkwOGNhZDk5ZGFjNmUw
+    ZjQ1ZmYwNjQzYzU2OWZhY2M4NjUwMmYzN2U2NWY1YzRlMmRiY2E=
   data.tar.gz: !binary |-
-    MGNlYjBhYzQ1YmI2MGU1NjNhMTNmYTliMGEzZTEzYzI4MjIyOWU5MTc5MjE2
-    M2FlOTkyNDdkMjRlOGIyN2Y5ZTM2NjM1NjUxNDAxNWNhNjJjNmY0NDU5ODkz
-    NmZkNjA0MDcxY2YwYmZjYzVjYmVlYWU5ZTE4YzhmNTEwNmYxNTQ=
+    OTdiNDgwZmM3MjQxNmM0MWE3NTJiMzlmZDY1NTIyYTg2NDcxOTBiNmJmOGE4
+    ZjIxNzIyZGIyMDc5Y2IyNTkxYTI4ZDVjMGE2YmZkYTk5OTljOTVhMjUxZmE4
+    YzRkNzM4ZmNiMTlkMWEyZGU4MDRjMTJkZGJmYmFhNWRlMzQzNjQ=

data/README.markdown

@@ -69,8 +69,9 @@ opsicle deploy staging
 opsicle deploy production
 
 ```
-You may also use `-m or --monitor` to open the Opsicle Stack Monitor, or
-`-b or --browser` to open the OpsWorks deployments screen for that app when deploying.
+By default, deploying opens the Opsicle Stack Monitor.
+You may also use `--browser` to open the OpsWorks deployments screen instead,
+or `--no-monitor` to ignore both monitoring options
 
 ### SSH
 ```bash

data/bin/opsicle

@@ -1,85 +1,117 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'commander/import'
+require 'gli'
 require 'opsicle'
 
-# :name is optional, otherwise uses the basename of this executable
-program :name, 'opsicle'
-program :version, Opsicle::VERSION
-program :description, 'Opsworks Command Line Utility Belt'
-program :help, 'Documentation', 'For documentation and help in setting up your configuration files, '\
-                                'see Opsicle\'s GitHub repo: https://github.com/sportngin/opsicle'
+include GLI::App
 
-global_option('--verbose'){ $verbose = true }
+program_desc 'Opsworks Command Line Utility Belt'
+version Opsicle::VERSION
 
-if ENV['DEBUG']
-  always_trace!
-  $debug = true
-else
-  never_trace!
-end
-$verbose = true  if ENV['VERBOSE']
+wrap_help_text :verbatim
+
+program_long_desc """
+DOCUMENTATION
+    For documentation and help in setting up your configuration files,
+    see Opsicle's GitHub repo: https://github.com/sportngin/opsicle
+"""
+
+switch :verbose, :desc => 'Enable Verbose mode for more logging', :negatable => false
+switch :debug, :desc => 'Enable Debug mode for detailed logs and backtraces', :negatable => false
+switch :color, :desc => 'Use colored output', :default_value => true
 
+pre do |global_options, command, options, args|
+  $verbose = global_options[:verbose]
+  $debug = global_options[:debug]
+  $color = global_options[:color]
+  ENV['GLI_DEBUG'] = $debug.to_s
+  true
+end
 
-default_command :help
+on_error do |exception|
+  exit(0) if exception.is_a?(Opsicle::Monitor::QuitMonitor)
+  true
+end
 
+desc "Deploy your current app to the given environment stack"
+arg_name '<environment>'
 command :deploy do |c|
-  c.syntax = "opsicle deploy <environment>"
-  c.description = "Deploy your current app to the given environment stack"
-  c.option "-b", "--browser", "Open the OpsWorks deployments screen for this stack on deploy"
-  c.option "-m", "--monitor", "Open the Opsicle Stack Monitor for this stack on deploy"
-  c.action do |args, options|
-    raise ArgumentError, "Environment is required" unless args.first
-    Opsicle::Deploy.new(args.first).execute(options.__hash__)
+  c.switch [:b, :browser], :desc => "Open the OpsWorks deployments screen for this stack on deploy"
+  c.switch [:m, :monitor], :desc => "Run the Stack Monitor on deploy", :default_value => true
+  c.action do |global_options, options, args|
+    raise ArgumentError, 'You must specify an environment' unless args.first
+    Opsicle::Deploy.new(args.first).execute global_options.merge(options)
   end
 end
 
+desc "List all apps in the given environment stack"
+arg_name '<environment>'
 command :list do |c|
-  c.syntax = "opsicle list <environment>"
-  c.description = "List all apps in the given environment stack"
-  c.action do |args, options|
+  c.action do |global_options, options, args|
     raise ArgumentError, "Environment is required" unless args.first
-    Opsicle::List.new(args.first).execute(options.__hash__)
+    Opsicle::List.new(args.first).execute global_options.merge options
   end
 end
 
+desc "SSH access to instances in the given environment stack"
+arg_name '<environment>'
 command :ssh do |c|
-  c.syntax = "opsicle ssh <environment>"
-  c.description = "SSH access to instances in the given environment stack"
-  c.action do |args, options|
+  c.action do |global_options, options, args|
     raise ArgumentError, "Environment is required" unless args.first
-    Opsicle::SSH.new(args.first).execute(options.__hash__)
+    Opsicle::SSH.new(args.first).execute global_options.merge(options)
   end
 end
 
+desc "Set your user SSH key (PUBLIC KEY) for OpsWorks"
+arg_name '<environment> <key-file>'
 command 'ssh-key' do |c|
-  c.syntax = "opsicle ssh-key <environment> <key-file>"
-  c.description = "Set your user SSH key (PUBLIC KEY) for OpsWorks"
-  c.action do |args, options|
+  c.action do |global_options, options, args|
     raise ArgumentError, "Environment is required" unless args.first
     raise ArgumentError, "ssh public key-file is required" unless args[1]
-    Opsicle::SSHKey.new(*args).execute(options.__hash__)
+    Opsicle::SSHKey.new(*args).execute global_options.merge(options)
   end
 end
 
+desc "Launch the Opsicle Stack Monitor for the given environment stack"
+arg_name '<environment>'
 command 'monitor' do |c|
-  c.syntax = "opsicle monitor <environment>"
-  c.description = "Launch the Opsicle Stack Monitor for the given environment stack"
-  c.action do |args, options|
+  c.action do |global_options, options, args|
     raise ArgumentError, "Environment is required" unless args.first
 
-    @monitor = Opsicle::Monitor::App.new(args.first, options.__hash__)
+    @monitor = Opsicle::Monitor::App.new(args.first, global_options.merge(options))
+    @monitor.start
+  end
+end
+
+desc "Show the OpsWorks URL for the given environment stack"
+long_desc """
+    Shows the full OpsWorks URL to a page in the web interface.
 
-    begin
-      @monitor.start
-    rescue => e
-      say "<%= color('Uh oh, an error occurred while starting the Opsicle Stack Monitor.', RED) %>"
-      say "<%= color('Use --trace to view stack trace.', RED) %>"
+    Acceptable arguments to --page include:
+      stack (default)
+      layers
+      instances
+      apps
+      deployments
+      monitoring
+      resources
+      permissions
 
-      if options.trace
-        raise
-      end
-    end
+    Example: 'opsicle opsworks-url staging --page=deployments'
+"""
+arg_name '<environment>'
+command 'opsworks-url' do |c|
+  opsworks_pages = %w[stack, layers, instances, apps, deployments, monitoring, resources, permissions]
+  c.flag [:p, :page],
+         :desc => 'Request a specific page in the OpsWorks web interface',
+         :must_match => opsworks_pages,
+         :default_value => 'stack'
+  c.action do |global_options, options, args|
+    raise ArgumentError, "Environment is required" unless args.first
+
+    url = "#{Opsicle::Client.new(args.first).opsworks_url}/#{options[:page]}"
+    Opsicle::Output.say url
   end
 end
-alias_command :'top', :'monitor'
+
+exit run(ARGV)

data/lib/opsicle.rb

@@ -4,6 +4,7 @@ Signal.trap("INT") do
   exit 1
 end
 
+require "opsicle/output"
 require "opsicle/version"
 require "opsicle/commands"
 require "opsicle/monitor"

data/lib/opsicle/client.rb

@@ -19,6 +19,10 @@ module Opsicle
       aws_client.public_send(command, options)
     end
 
+    def opsworks_url
+      "https://console.aws.amazon.com/opsworks/home?#/stack/#{@config.opsworks_config[:stack_id]}"
+    end
+
     def command_options(command, options={})
       config.opsworks_config.merge(options).merge({ command: { name: command } })
     end

data/lib/opsicle/commands/deploy.rb

@@ -7,34 +7,28 @@ module Opsicle
       @client = Client.new(environment)
     end
 
-    def execute(options={})
+    def execute(options={ monitor: true })
+      Output.say "Starting OpsWorks deploy..."
       response = client.run_command('deploy')
 
+      # Monitoring preferences
       if options[:browser]
         open_deploy(response[:deployment_id])
-      end
-
-      if options[:monitor]
+      elsif options[:monitor] # Default option
+        Output.say_verbose "Starting Stack Monitor..."
         @monitor = Opsicle::Monitor::App.new(@environment, options)
-
-        begin
-          @monitor.start
-        rescue => e
-          say "<%= color('Uh oh, an error occurred while starting the Opsicle Stack Monitor.', RED) %>"
-          say "<%= color('Use --trace to view stack trace.', RED) %>"
-
-          if options.trace
-            raise
-          end
-        end
+        @monitor.start
       end
+
     end
 
     def open_deploy(deployment_id)
       if deployment_id
-        exec "open 'https://console.aws.amazon.com/opsworks/home?#/stack/#{client.config.opsworks_config[:stack_id]}/deployments'"
+        command = "open 'https://console.aws.amazon.com/opsworks/home?#/stack/#{client.config.opsworks_config[:stack_id]}/deployments'"
+        Output.say_verbose "Executing shell command: #{command}"
+        %x(#{command})
       else
-        puts 'deploy failed'
+        Output.say "Deploy failed. No deployment_id was received from OpsWorks", "RED"
       end
     end
   end

data/lib/opsicle/commands/ssh.rb

@@ -10,9 +10,9 @@ module Opsicle
       if instances.length == 1
         choice = 1
       else
-        say "Choose an Opsworks instance: \n"
+        Output.say "Choose an Opsworks instance:"
         instances.each_index do |x|
-          say "#{x+1}) #{instances[x][:hostname]}"
+          Output.say "#{x+1}) #{instances[x][:hostname]}"
         end
         choice = ask("? ", Integer) { |q| q.in = 1..instances.length }
       end
@@ -20,7 +20,7 @@ module Opsicle
       instance_ip = instances[choice-1][:elastic_ip] || instances[choice-1][:public_ip]
 
       command = "ssh #{ssh_username}@#{instance_ip}"
-      say "<%= color('Executing shell command: #{command}', YELLOW) %>" if $verbose
+      Output.say_verbose "Executing shell command: #{command}"
       system(command)
     end
 

data/lib/opsicle/commands/ssh_key.rb

@@ -9,7 +9,7 @@ module Opsicle
     def execute(options={})
       validate!
       update
-      say "ssh-key updated successfully"
+      Output.say "ssh-key updated successfully"
     end
 
     def validate!

data/lib/opsicle/monitor/app.rb

@@ -56,7 +56,7 @@ module Opsicle
         @screen.close
         @screen = nil # Ruby curses lib doesn't have closed?(), so we set to nil, just in case
 
-        exit 0
+        raise QuitMonitor
       end
 
       def restart
@@ -143,5 +143,6 @@ module Opsicle
         %x(open 'https://console.aws.amazon.com/opsworks/home?#/stack/#{App.client.config.opsworks_config[:stack_id]}')
       end
     end
+    QuitMonitor = Class.new(StandardError)
   end
 end

data/lib/opsicle/output.rb

@@ -0,0 +1,17 @@
+require 'highline/import'
+
+module Opsicle
+  module Output
+    def self.say(msg, color_requested=nil)
+      if $color && color_requested
+        super "<%= color('#{msg}', #{color_requested}) %>"
+      else
+        super msg
+      end
+    end
+
+    def self.say_verbose(msg, color="MAGENTA")
+      self.say "<%= color('#{msg}', #{color}) %>" if $verbose
+    end
+  end
+end

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/opsicle.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "aws-sdk", "~> 1.30"
-  spec.add_dependency "commander", "~> 4.1.6"
+  spec.add_dependency "gli"
+  spec.add_dependency "highline"
   spec.add_dependency "terminal-table"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/opsicle/client_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require "opsicle/client"
+require "opsicle"
 
 module Opsicle
   describe Client do

data/spec/opsicle/commands/deploy_spec.rb

@@ -1,6 +1,5 @@
 require "spec_helper"
-require "opsicle/commands/deploy"
-require "opsicle/monitor"
+require "opsicle"
 
 module Opsicle
   describe Deploy do
@@ -15,30 +14,32 @@ module Opsicle
 
         allow(Monitor::App).to receive(:new).and_return(monitor)
         allow(monitor).to receive(:start)
+
+        allow(Output).to receive(:say)
+        allow(Output).to receive(:say_verbose)
       end
 
-      it "creates a new deployment" do
+      it "creates a new deployment and opens stack monitor" do
         expect(client).to receive(:run_command).with('deploy').and_return({deployment_id: 'derp'})
         expect(subject).to_not receive(:open_deploy)
-        expect(Monitor::App).to_not receive(:new)
+        expect(Monitor::App).to receive(:new)
 
         subject.execute
       end
 
-      it "runs the Opsicle Stack Monitor if monitor option is given" do
-        expect(Monitor::App).to receive(:new).and_return(monitor)
-        expect(monitor).to receive(:start)
-        expect(subject).to_not receive(:open_deploy)
-
-        subject.execute({ monitor: true })
-      end
-
       it "opens the OpsWorks deployments screen if browser option is given" do
         expect(subject).to receive(:open_deploy)
         expect(Monitor::App).to_not receive(:new)
 
         subject.execute({ browser: true })
       end
+
+      it "doesn't open the stack monitor or open the browser window when no-monitor option is given" do
+        expect(subject).to_not receive(:open_deploy)
+        expect(Monitor::App).to_not receive(:new)
+
+        subject.execute({ monitor: false })
+      end
     end
 
     context "#client" do

data/spec/opsicle/commands/list_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require "opsicle/commands/list"
+require "opsicle"
 
 module Opsicle
   describe List do

data/spec/opsicle/commands/ssh_key_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require "opsicle/commands/ssh_key"
+require "opsicle"
 
 module Opsicle
   describe SSHKey do
@@ -16,14 +16,14 @@ module Opsicle
       context "valid ssh key" do
         it "confirms that the given file is a public ssh key" do
           expect(subject).to receive(:validate!)
-          expect(subject).to receive(:say).with(/success/)
+          expect(Output).to receive(:say).with(/success/)
           allow(subject).to receive(:update)
           subject.execute
         end
 
         it "updates the user's ssh-key on opsworks" do
           allow(subject).to receive(:validate!)
-          expect(subject).to receive(:say).with(/success/)
+          expect(Output).to receive(:say).with(/success/)
           expect(subject).to receive(:update)
           subject.execute
         end

data/spec/opsicle/commands/ssh_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require "opsicle/commands/ssh"
+require "opsicle"
 
 module Opsicle
   describe SSH do
@@ -12,7 +12,8 @@ module Opsicle
 
     context "#execute" do
       before do
-        allow(subject).to receive(:say) { "What instance do you want, huh?" }
+        allow(Output).to receive(:say)
+        allow(Output).to receive(:say_verbose)
         allow(subject).to receive(:ask).and_return(2)
         allow(subject).to receive(:ssh_username) {"mrderpyman2014"}
       end

data/spec/opsicle/config_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require "opsicle/config"
+require "opsicle"
 
 module Opsicle
   describe Config do

data/spec/opsicle/monitor/app_spec.rb

@@ -1,6 +1,5 @@
 require "spec_helper"
-require "opsicle/monitor/app"
-require "opsicle/monitor/screen"
+require "opsicle"
 
 describe Opsicle::Monitor::App do
 

data/spec/opsicle/monitor/panel_spec.rb

@@ -1,8 +1,7 @@
 require "spec_helper"
-require "opsicle/monitor/panel"
+require "opsicle"
 require "curses"
 
-
 describe Opsicle::Monitor::Panel do
 
   before do

data/spec/opsicle/monitor/screen_spec.rb

@@ -1,9 +1,5 @@
 require "spec_helper"
-require "opsicle/monitor/screen"
-require "opsicle/monitor/panels/header"
-require "opsicle/monitor/panels/deployments"
-require "opsicle/monitor/panels/help"
-
+require "opsicle"
 
 describe Opsicle::Monitor::Screen do
 

data/spec/opsicle/monitor/spy/deployments_spec.rb

@@ -1,9 +1,5 @@
 require 'spec_helper'
-require 'opsicle/deployments'
-require 'opsicle/monitor/spy/dataspyable'
-require 'opsicle/monitor/translatable'
-require 'opsicle/monitor/spy/deployments'
-require 'opsicle/monitor/app'
+require 'opsicle'
 
 describe Opsicle::Monitor::Spy::Deployments do
   before do

data/spec/opsicle/monitor/subpanel_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require "opsicle/monitor/subpanel"
+require "opsicle"
 
 
 describe Opsicle::Monitor::Subpanel do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Andy Fleener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -25,19 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.30'
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +176,7 @@ files:
 - lib/opsicle/monitor/spy/deployments.rb
 - lib/opsicle/monitor/subpanel.rb
 - lib/opsicle/monitor/translatable.rb
+- lib/opsicle/output.rb
 - lib/opsicle/stack.rb
 - lib/opsicle/version.rb
 - opsicle.gemspec