management 1.3.1 → 1.3.2

data/README.md

@@ -49,9 +49,26 @@ with servers that it created, since it requires certain metadata to
 work. And because it uses EC2 tags, it's currently kind of hard-coded
 to only work on EC2.
 
-#### Sample Configs
+#### Example
 
-Put this in `management_config.yml` at the root of some project:
+Given this fictional project tree:
+
+    $ tree my-project/
+    my-project/
+    ├── management_config.yml
+    ├── < other project files... >
+    └── resources
+        ├── files
+        │   ├── nginx.conf
+        │   └── web.conf.erb
+        ├── keys
+        │   ├── id_rsa_aws
+        │   └── id_rsa_aws.pub
+        └── scripts
+            ├── bootstrap_base.sh
+            └── start_web_server.sh
+
+And these contents of `management_config.yml`:
 
     cloud:
       provider: AWS
@@ -59,6 +76,9 @@ Put this in `management_config.yml` at the root of some project:
       aws_secret_access_key: 456
       region: New York 1
 
+    root_user: ubuntu
+    ssh_key_path: resources/keys/id_rsa_aws
+
     envs:
       - staging
       - production
@@ -69,7 +89,6 @@ 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/keys/id_rsa_aws
 
     scripts:
       setup-web:
@@ -80,26 +99,12 @@ Put this in `management_config.yml` at the root of some project:
         - copy: [resources/scripts/start_web_server.sh, /home/webapp/start_web_server.sh]
         - run: /home/webapp/start_web_server.sh
 
-Management doesn't care where any of your files are, with the exception of
-`management_config.yml`, which it expects to be in your project's
-root. Here's the relevant part of the file structure that the above
-sample config assumes:
+You could run:
 
-    $ 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
+    $ management create-server staging web
+    $ management run-script staging-web-1 setup-web
 
-    4 directories, 7 files
+And you'd have a fully functional web server!
 
 #### Details
 

data/lib/management/commands/run_script.rb

@@ -15,7 +15,7 @@ module Management
       server = get_server(server_name)
       script = get_script(script_name)
 
-      server.private_key_path = config[:types][server.type.to_sym][:ssh_key_path]
+      server.private_key_path = config[:ssh_key_path]
 
       missing = missing_local_files(script)
       abort "The following files are missing:" + (["\n"] + missing).join("\n - ") if !missing.empty?
@@ -35,7 +35,7 @@ module Management
 
           code = run_remote_command(server, cmd)
           if code != 0
-            abort "Failed. Exit code: #{code}"
+            abort "############ Failed. Exit code: #{code}"
           end
         end
       end

data/lib/management/commands/ssh_server.rb

@@ -9,8 +9,7 @@ module Management
     def run(server_name)
       server = get_server(server_name)
 
-      type = config[:types][server.type.to_sym]
-      ssh_key_path = type[:ssh_key_path]
+      ssh_key_path = config[:ssh_key_path]
       system_verbose "chmod 0600 #{ssh_key_path}"
       system_verbose "ssh -i #{ssh_key_path} #{config[:root_user]}@#{server.public_ip_address}"
     end

data/lib/management/helper.rb

@@ -43,7 +43,7 @@ module Management
     end
 
     def system_verbose(cmd)
-      puts "Running: #{cmd}"
+      puts "############ Running: #{cmd}"
       system cmd
     end
 

data/lib/management/version.rb

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

data/spec/main_spec.rb

@@ -17,13 +17,15 @@ envs:
   - staging
   - production
 
+root_user: ubuntu
+ssh_key_path: resources/my-ssh-key
+
 types:
   web:
     image_id: ami-1234
     flavor_id: m1.small
     key_name: my-ssh-key-name
     groups: ["web"]
-    ssh_key_path: resources/my-ssh-key
 
 scripts:
   testing:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: management
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors: