management 1.3 → 1.3.1

data/README.md

@@ -2,8 +2,6 @@
 
 Minimalist EC2 configuration & deployment tool.
 
-- Version: **1.3**
-
 [![Build Status](https://travis-ci.org/sdegutis/management.svg?branch=master)](https://travis-ci.org/sdegutis/management)
 [![Dependency Status](https://gemnasium.com/sdegutis/management.svg)](https://gemnasium.com/sdegutis/management)
 [![Code Climate](https://codeclimate.com/github/sdegutis/management.png)](https://codeclimate.com/github/sdegutis/management)
@@ -71,7 +69,7 @@ Put this in `management_config.yml` at the root of some project:
         flavor_id: m1.small
         key_name: my-ssh-key-name
         groups: ["web"]
-        ssh_key_path: resources/my-ssh-key
+        ssh_key_path: resources/keys/id_rsa_aws
 
     scripts:
       setup-web:
@@ -87,18 +85,21 @@ Management doesn't care where any of your files are, with the exception of
 root. Here's the relevant part of the file structure that the above
 sample config assumes:
 
-    ./my-project
-    |-- management_config.yml
-    `-- resources
-        |-- files
-        |   |-- nginx.conf
-        |   `-- web.conf.erb
-        |-- keys
-        |   |-- id_rsa_digitalocean
-        |   `-- id_rsa_digitalocean.pub
-        `-- scripts
-            |-- bootstrap_base.sh
-            `-- start_web_server.sh
+    $ tree my-project/
+    my-project/
+    ├── management_config.yml
+    └── resources
+        ├── files
+        │   ├── nginx.conf
+        │   └── web.conf.erb
+        ├── keys
+        │   ├── id_rsa_aws
+        │   └── id_rsa_aws.pub
+        └── scripts
+            ├── bootstrap_base.sh
+            └── start_web_server.sh
+
+    4 directories, 7 files
 
 #### Details
 

data/lib/management.rb

@@ -1,4 +1,3 @@
-require_relative 'ext/fog'
 require_relative 'management/version'
 require_relative 'management/interpreter'
 require_relative 'management/helper'

data/lib/management/commands/run_script.rb

@@ -1,8 +1,4 @@
 require_relative '../command'
-require 'tmpdir'
-require 'fileutils'
-require 'erb'
-require 'shellwords'
 
 module Management
 
@@ -11,6 +7,11 @@ module Management
     include Management::Helper
 
     def run(server_name, script_name)
+      require 'tmpdir'
+      require 'fileutils'
+      require 'erb'
+      require 'shellwords'
+
       server = get_server(server_name)
       script = get_script(script_name)
 

data/lib/management/helper.rb

@@ -1,6 +1,3 @@
-require 'fog'
-require 'yaml'
-
 module Management
 
   module Helper
@@ -40,6 +37,8 @@ module Management
     end
 
     def cloud
+      require 'fog'
+      require_relative '../ext/fog'
       @cloud ||= Fog::Compute.new(config[:cloud])
     end
 
@@ -52,6 +51,7 @@ module Management
     private
 
     def raw_yaml
+      require 'yaml'
       YAML.load(File.read("management_config.yml"))
     end
 

data/lib/management/interpreter.rb

@@ -1,8 +1,8 @@
-require 'optparse'
-
 module Management
 
   def self.interpret!(argv)
+    require 'optparse'
+
     commands = Management::Command.all
 
     parser = OptionParser.new do |opts|
@@ -11,8 +11,8 @@ module Management
       opts.separator('Commands:')
       commands.each { |command| opts.separator command.help_string }
       opts.separator('')
-      opts.on('-h', '--help', 'Display this screen') { puts opts; exit }
-      opts.on('-v', '--version', 'Show version') { puts Management::VERSION; exit }
+      opts.on('-h', '--help', 'Display this screen') { abort opts.to_s }
+      opts.on('-v', '--version', 'Show version') { abort Management::VERSION }
     end
 
     abort parser.help if argv.empty?

data/lib/management/version.rb

@@ -1,3 +1,3 @@
 module Management
-  VERSION = "1.3"
+  VERSION = "1.3.1"
 end

data/spec/main_spec.rb

@@ -3,7 +3,8 @@ require 'fakefs/spec_helpers'
 require 'stringio'
 require 'pry'
 require 'etc'
-
+require 'yaml'
+require 'timeout'
 
 SampleConfig = <<EOC
 cloud:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: management
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog