marathon-scooter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9188789d70a2e520dfdfe0cbf5570b640a70ed8
-  data.tar.gz: 703261162dc2b6e0e1bc4878721e91e24f213100
+  metadata.gz: a6a0f104c9e674cce6b58e72b896572830e8900b
+  data.tar.gz: 170ba99b351d7322f51c7d7943a9976e0c4abeb0
 SHA512:
-  metadata.gz: 23e461ccebde469721904b1e85588f637602ffd173401d6cb433ea6cdfddb58dc7f2d59baf55c5aa3a36445cf40115a5dffd57143dbdb57f898ceccaba31e3ef
-  data.tar.gz: 732af951b9b09d76ab579f2877d059121df787fbd5e61a0b53ae61ec99956d4e83df7fcd11e35bf28d974b8cd60cff2abf47f60485d87736e5dc6269c35d6e1b
+  metadata.gz: e04f8c6dc0fc9748393119f874331a6335b8ab061a4a14b29f791adb32de41f15af0ded82c71025442976959c9fa94f7d21f502c79de311c5ce40bdc3e197ebc
+  data.tar.gz: 62ddf0235cd0b0e195b41e6795c2a37a4a27c4ff5611e10b808683940bb026d2728796bf4d54d6238242c68a8973ee39e19d76209ce7bcf098fd1dc48a5a71e7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.2 - 2015-09-11
+
+* Added exception handling around `info` command.
+* Added some additional exception handling around common network exceptions.
+
 ## 0.1.1 - 2015-09-03
 
 * Fixed `clean` bug with JSON files that do not include a leading slash for the application id.

data/README.md

@@ -65,13 +65,21 @@ This command will clean up the JSON for a given file or directory of files, remo
 Scooter provides the ability to set global options via environment variables for the following:
 
 SCOOTER_COLOR
+
 SCOOTER_MARATHON_HOST
+
 SCOOTER_MARATHON_USER
+
 SCOOTER_MARATHON_PASS
+
 SCOOTER_MARATHON_PROXY_HOST
+
 SCOOTER_MARATHON_PROXY_PORT
+
 SCOOTER_MARATHON_PROXY_USER
+
 SCOOTER_MARATHON_PROXY_PASS
+
 SCOOTER_VERBOSE
 
 ## Examples
@@ -88,7 +96,13 @@ scooter info
 
 By default Scooter looks for Marathon on localhost and provides an option to specify what Marathon host to target:
 
-````
+````bash
 scooter --marathon=https://somecluster.marathon.service.consul info
 ````
 
+Or using environment variables:
+
+````bash
+export SCOOTER_MARATHON_HOST=https://marathon.service.consul
+scooter info
+````

data/bin/scooter

@@ -15,6 +15,7 @@ begin
   # Let the GLI do its thing
   Kernel.exit!(Scooter::GLI.new.execute!)
 rescue => e
+  $stderr.puts e.class
   $stderr.puts e.inspect
   $stderr.puts e.message
   $stderr.puts e.backtrace.join("\n")

data/lib/scooter/commands/info.rb

@@ -6,24 +6,31 @@ module Scooter
     class Info < Scooter::Command
       def run
         Scooter.ui.verbose("Executing the `#{name}` command.")
-        Scooter.ui.announce('---- Marathon Configuration ----')
-        Scooter.ui.out("Name:              #{::Marathon.info['name']}")
-        Scooter.ui.out("Checkpoint:        #{::Marathon.info['marathon_config']['checkpoint']}")
-        Scooter.ui.out("High Availability: #{::Marathon.info['marathon_config']['ha'].to_s.green}")
-        Scooter.ui.out("Version:           #{::Marathon.info['version']}")
-        Scooter.ui.out
-        
-        apps = ::Marathon::App.list
-        if apps.length > 0
-          Scooter.ui.announce('---- Application Configuration ----')
-          ::Marathon::App.list.each do |app|
-            # Derive the colors for the various output
-            read_only_color = app.read_only ? :red : :light_green
-            
-            Scooter.ui.out("#{printf('%-25s', app.id)}  I:#{app.instances} C:#{app.cpus} M:#{app.mem} D:#{app.disk} RO:#{Scooter.ui.color(app.read_only.to_s,read_only_color)}")
+        begin
+
+          apps = ::Marathon::App.list
+
+          Scooter.ui.announce('---- Marathon Configuration ----')
+          Scooter.ui.out("Name:              #{::Marathon.info['name']}")
+          Scooter.ui.out("Checkpoint:        #{::Marathon.info['marathon_config']['checkpoint']}")
+          Scooter.ui.out("High Availability: #{::Marathon.info['marathon_config']['ha'].to_s.green}")
+          Scooter.ui.out("Version:           #{::Marathon.info['version']}")
+          Scooter.ui.out
+
+          if apps.length > 0
+            Scooter.ui.announce('---- Application Configuration ----')
+
+            apps.each do |app|
+              # Derive the colors for the various output
+              read_only_color = app.read_only ? :red : :light_green
+              
+              Scooter.ui.out("#{printf('%-25s', app.id)}  I:#{app.instances} C:#{app.cpus} M:#{app.mem} D:#{app.disk} RO:#{Scooter.ui.color(app.read_only.to_s,read_only_color)}")
+            end
+          else
+            Scooter.ui.warn('There are no applications configured.')
           end
-        else
-          Scooter.ui.warn('There are no applications configured.')
+        rescue ::Marathon::Error => e
+          Scooter.ui.warn(e.inspect)
         end
 
         Scooter.ui.verbose("Execution of `#{name}` command has completed.")

data/lib/scooter/gli.rb

@@ -10,7 +10,7 @@ module Scooter
     APP_ID_REGEX = /^[a-zA-z0-9\.\-\/]+$/
 
     def initialize
-      program_desc 'Opinionated synchronization of Marathon jobs from JSON files.'
+      program_desc 'Opinionated synchronization of Marathon apps from JSON files.'
       version Scooter::Version::STRING.dup
 
       # Global Accepts
@@ -91,10 +91,18 @@ module Scooter
       # Error handling
 
       on_error do |e|
-        #$stderr.puts e.inspect
-        $stderr.puts e.message
-        $stderr.puts e.backtrace
-        true
+        case e
+        when ::Marathon::Error::AuthenticationError
+          $stderr.puts "Login failed.  Please check credentials."
+        when ::Marathon::Error::ClientError
+          $stdout.puts "Missing required argument: #{e.message}"
+        when ::Marathon::Error::IOError
+          $stderr.puts "Unable to connect to host!"
+        when ::Timeout::Error
+          $stderr.puts "Timeout while connecting to host!"
+        else      
+          $stderr.puts "Unhandled exception(#{e.class}) -- #{e.message}"
+        end
       end
       
       # Commands
@@ -116,13 +124,13 @@ module Scooter
         end
       end
 
-      desc 'Remove job configurations from Marathon that do not exist in the given directory.'
+      desc 'Remove app configurations from Marathon that do not exist in the given directory.'
       command :clean do |c|
         
-        c.desc 'A job configuration directory'
+        c.desc 'An app configuration directory'
         c.flag [:dir, :directory]
 
-        c.desc 'Perform the actual deletion of the jobs in Marathon'
+        c.desc 'Perform the actual deletion of the app(s) in Marathon'
         c.switch [:delete], default_value: false
 
         c.action do |global_options, options, _args|
@@ -137,13 +145,13 @@ module Scooter
         end
       end
 
-      desc 'Delete the job configuration from Marathon for the given app.'
+      desc 'Delete the configuration from Marathon for the given app.'
       command :delete do |c|
 
         c.desc 'Application ID'
         c.flag [:id], required: true, must_match: APP_ID_REGEX
 
-        c.desc 'Perform the actual deletion of the jobs in Marathon'
+        c.desc 'Perform the actual deletion of the app in Marathon'
         c.switch [:delete], default_value: false
 
         c.action do |global_options, options, _args|
@@ -151,10 +159,10 @@ module Scooter
         end
       end
       
-      desc 'Export the jobs configurations whose name matches the given regex.'
+      desc 'Export the app configurations whose name match the given regex.'
       command :export do |c|
 
-        c.desc 'A job configuration directory'
+        c.desc 'An app configuration directory'
         c.flag [:dir, :directory]
 
         c.desc 'Marathon Application Regex. (Note: nil implies `.*`)'
@@ -193,13 +201,13 @@ module Scooter
         end
       end
 
-      desc 'Synchronize the given job configuration(s) with Marathon.'
+      desc 'Synchronize the given app configuration(s) with Marathon.'
       command :sync do |c|
 
-        c.desc 'A job configuration directory'
+        c.desc 'An app configuration directory'
         c.flag [:dir, :directory]
 
-        c.desc 'A job configuration file'
+        c.desc 'An app configuration file'
         c.flag [:file]
 
         c.action do |global_options, options, _args|
@@ -226,13 +234,13 @@ module Scooter
         end
       end
 
-      desc 'Tidy the JSON format for the given job configuration(s).'
+      desc 'Tidy the JSON format for the given app configuration(s).'
       command :tidy do |c|
 
-        c.desc 'A job configuration directory'
+        c.desc 'An app configuration directory'
         c.flag [:dir, :directory]
 
-        c.desc 'A job configuration file'
+        c.desc 'An app configuration file'
         c.flag [:file]
 
         c.action do |global_options, options, _args|

data/lib/scooter/version.rb

@@ -6,7 +6,7 @@ module Scooter
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon-scooter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Yieldbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -150,7 +150,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-description: Opinionated synchronization of Marathon jobs from JSON files.
+description: Opinionated synchronization of Marathon apps from JSON files.
 email:
 - devops@yieldbot.com
 executables:
@@ -203,7 +203,7 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Opinionated synchronization of Marathon jobs from JSON files.
+summary: Opinionated synchronization of Marathon apps from JSON files.
 test_files:
 - spec/scooter_spec.rb
 - spec/spec_helper.rb