rumm 0.0.22 → 0.0.23

data/app/help/create_node_on_loadbalancer.txt

@@ -0,0 +1,17 @@
+Usage:
+    rumm create node on loadbalancer LOADBALANCER_ID [--address IPADDRESS] [--port INTEGER] [--type PRIMARY|SECONDARY] [--condition ENABLED|DISABLED|DRAINING]
+
+Options:
+    --address IPADDRESS                     # IP address for the node
+    --port INTEGER                          # Port number for what you're loadbalancing
+    --type PRIMARY|SECONDARY                # Type of node to add
+    --condition ENABLED|DISABLED|DRAINING   # Condition of the node
+
+Arguments:
+    LOADBALANCER_ID: STRING         # Name of the loadbalancer that contains the node requested
+
+Description:
+    Creates a new node on the named load balancer.
+
+Examples:
+    rumm create node on loadbalancer LOADBALANCER_ID

data/app/help/create_server.txt

@@ -1,12 +1,12 @@
 Usage:
-    rumm create server [--name STRING] [--image-id STRING] [--flavor-id STRING]
+    rumm create server [--name STRING] [--image-id STRING] [--flavor-id STRING] [--ssh-private STRING] [--ssh-publinc STRING]
 
 Options:
     -n, --name STRING                  # Name to give the new server
     -i, --image-id STRING              # Use this VM image
     -f, --flavor-id STRING             # Create with the specified flavor
-    --private-key-path STRING          # Path to your private ssh key
-    --public-key-path STRING           # Path to your public ssh key
+    --ssh-private STRING               # Path to your private ssh key
+    --ssh-public STRING                # Path to your public ssh key
 
 Arguments:
     none
@@ -20,7 +20,7 @@ Description:
 
      rumm assumes that your ssh keys are at ~/.ssh/id_rsa.pub and
      ~/.ssh/id_rsa. If that is not the case, you will need to specify the path
-     to your keys with the public-key-path and private-key-path options.
+     to your keys with the ssh-public and ssh-private options.
 
 Examples:
     rumm create server

data/app/help/create_volume.txt

@@ -1,8 +1,10 @@
 Usage:
-    rumm create volume
+    rumm create volume [--name STRING] [--type SATA|SSD] [--size INTEGER]
 
 Options:
-    none
+    --name STRING              # The name to be given to the volume
+    --type SATA|SSD            # The type of volume to be created
+    --size INTEGER             # The size in GB of the volume
 
 Arguments:
     none

data/app/help/destroy_attachment_on_server.txt

@@ -0,0 +1,14 @@
+Usage:
+    rumm destroy attachment on server SERVER_ID
+
+Options:
+    -v, --volume STRING        # Name of the volume to attach
+
+Arguments:
+    SERVER_ID: STRING          # The name of the server the volume is to be detached from
+
+Description:
+    Detaches the specified volume from the named server.
+
+Examples:
+    rumm destroy attachment on server superordinate-struthioniformes --volume colorful-caterpillar

data/app/help/destroy_user_on_dbinstance.txt

@@ -0,0 +1,15 @@
+Usage:
+    rumm destroy user ID on dbinstance DBINSTANCE_ID
+
+Options:
+    none
+
+Arguments:
+    ID: STRING          # Name of the user to destroy
+    DBINSTANCE_ID       # Name of the dbinstance the user is on
+
+Description:
+    This command will send a request to destroy the named user on the given dbinstance.
+
+Examples:
+    rumm destroy user happy-hippo on dbinstance daring-basket

data/app/help/download_file_in_container.txt

@@ -0,0 +1,15 @@
+Usage:
+    rumm download file ID in container CONTAINER_ID [--destination PATHNAME]
+
+Options:
+    --destination: PATHNAME      # Path to download the file to
+
+Arguments:
+    ID: STRING                   # Name of the file to download
+    CONTAINER_ID: STRING         # Name of the container to store the file
+
+Description:
+    Uploads the specified file to the specified container.
+
+Examples:
+    rumm download file log.txt on container colorful-cat

data/app/help/routes.rb

@@ -31,7 +31,7 @@ help('destroy loadbalancer')
 
 help('show nodes on loadbalancer')
 help('show node on loadbalancer')
-help('createnode on loadbalancer')
+help('create node on loadbalancer')
 help('update node on loadbalancer')
 help('destroy node on loadbalancer')
 
@@ -50,6 +50,7 @@ help('destroy database on dbinstance')
 help('show users on dbinstance')
 help('show user on dbinstance')
 help('create user on dbinstance')
+help('destroy user on dbinstance')
 
 help('ssh')
 
@@ -73,5 +74,5 @@ help('update volume')
 help('destroy volume')
 
 help('show attachments on server')
-help('attach volume to server')
-help('detach volume from server')
+help('create attachment on server')
+help('destroy attachment on server')

data/app/help/show_attachment_on_server.txt

@@ -0,0 +1,14 @@
+Usage:
+    rumm show attachment on server SERVER_ID
+
+Options:
+    -v, --volume STRING        # Name of the volume to attach
+
+Arguments:
+    SERVER_ID: STRING          # The name of the server the volume is to be detached from
+
+Description:
+    Detaches the specified volume from the named server.
+
+Examples:
+    rumm show attachment on server superordinate-struthioniformes --volume colorful-caterpillar

data/app/help/show_user_on_dbinstance.txt

@@ -0,0 +1,15 @@
+Usage:
+    rumm show user ID on dbinstance DBINSTANCE_ID
+
+Options:
+    none
+
+Arguments:
+    ID: STRING          # Name of the user to destroy
+    DBINSTANCE_ID       # Name of the dbinstance the user is on
+
+Description:
+    Shows the attributes of the specified user on the given dbinstance
+
+Examples:
+    rumm show user happy-hippo on dbinstance daring-basket

data/app/providers/compute_provider.rb

@@ -8,7 +8,8 @@ class ComputeProvider
       :rackspace_username  => credentials.username,
       :rackspace_api_key   => credentials.api_key,
       :version             => :v2,
-      :rackspace_region    => credentials.rackspace_region
+      :rackspace_region    => credentials.rackspace_region,
+      :connection_options => {:headers => {"User-Agent" => "rumm/#{Rumm::VERSION} fog/#{Fog::VERSION}"}}
     }
     Fog::Compute.new(options)
   end

data/app/providers/containers_provider.rb

@@ -8,7 +8,8 @@ class ContainersProvider
       :provider           => 'Rackspace',
       :rackspace_username => credentials.username,
       :rackspace_api_key  => credentials.api_key,
-      :rackspace_region   => credentials.rackspace_region
+      :rackspace_region   => credentials.rackspace_region,
+      :connection_options => {:headers => {"User-Agent" => "rumm/#{Rumm::VERSION} fog/#{Fog::VERSION}"}}
     }
     Fog::Storage.new(options).directories
   end

data/app/providers/databases_provider.rb

@@ -6,7 +6,8 @@ class DatabasesProvider
     options = {
       :rackspace_username => credentials.username,
       :rackspace_api_key  => credentials.api_key,
-      :rackspace_region   => credentials.rackspace_region
+      :rackspace_region   => credentials.rackspace_region,
+      :connection_options => {:headers => {"User-Agent" => "rumm/#{Rumm::VERSION} fog/#{Fog::VERSION}"}}
     }
     Fog::Rackspace::Databases.new(options).databases
   end

data/app/providers/instances_provider.rb

@@ -6,7 +6,8 @@ class InstancesProvider
     options = {
       :rackspace_username => credentials.username,
       :rackspace_api_key  => credentials.api_key,
-      :rackspace_region   => credentials.rackspace_region
+      :rackspace_region   => credentials.rackspace_region,
+      :connection_options => {:headers => {"User-Agent" => "rumm/#{Rumm::VERSION} fog/#{Fog::VERSION}"}}
     }
     Fog::Rackspace::Databases.new(options).instances
   end

data/app/providers/loadbalancers_provider.rb

@@ -6,7 +6,8 @@ class LoadbalancersProvider
     options = {
       :rackspace_username   => credentials.username,
       :rackspace_api_key    => credentials.api_key,
-      :rackspace_region     => credentials.rackspace_region
+      :rackspace_region     => credentials.rackspace_region,
+      :connection_options => {:headers => {"User-Agent" => "rumm/#{Rumm::VERSION} fog/#{Fog::VERSION}"}}
     }
     Fog::Rackspace::LoadBalancers.new(options).load_balancers
   end

data/app/providers/nodes_provider.rb

@@ -6,7 +6,8 @@ class NodesProvider
     options = {
       :rackspace_username => credentials.username,
       :rackspace_api_key  => credentials.api_key,
-      :rackspace_region   => credentials.rackspace_region
+      :rackspace_region   => credentials.rackspace_region,
+      :connection_options => {:headers => {"User-Agent" => "rumm/#{Rumm::VERSION} fog/#{Fog::VERSION}"}}
     }
     Fog::Rackspace::LoadBalancers.new(options).nodes
   end

data/app/providers/volumes_provider.rb

@@ -7,7 +7,8 @@ class VolumesProvider
     options = {
       :rackspace_username => credentials.username,
       :rackspace_api_key  => credentials.api_key,
-      :rackspace_region   => credentials.rackspace_region
+      :rackspace_region   => credentials.rackspace_region,
+      :connection_options => {:headers => {"User-Agent" => "rumm/#{Rumm::VERSION} fog/#{Fog::VERSION}"}}
     }
     Fog::Rackspace::BlockStorage.new(options).volumes
   end

data/app/routes.rb

@@ -1,7 +1,7 @@
-macro /(-v|--version)/ => "version"
+macro /^(-v|--version)/ => "version"
 match 'version' => proc {|cmd| cmd.output << "#{Rumm::VERSION}\n" }
 
-macro /(-h|--help)(.*)/ => "help\\2"
+macro /(.*[^\-]|^)(-h(\s|$)|--help)(.*)/ => "help \\1\\4"
 match 'help' => 'help#show'
 
 match 'login' => 'authentication#login'
@@ -67,8 +67,9 @@ match 'update volume :id' => 'volumes#update'
 match 'destroy volume :id' => 'volumes#destroy'
 
 match 'show attachments on server :server_id' => 'attachments#index'
-match 'attach volume :id to server :server_id' => 'attachments#attach'
-match 'detach volume :id from server :server_id' => 'attachments#detach'
+match 'create attachment on server :server_id' => 'attachments#attach'
+match 'destroy attachment on server :server_id' => 'attachments#detach'
+match 'show attachment on server :server_id' => 'attachments#show'
 
 # Stop-gap measure to load help for each rumm command
 # ==========

data/app/views/attachments/attach.txt.erb

@@ -1 +1,4 @@
-<%= this.inspect %> 
+Attached volume:
+  device: <%= this.device %>
+  serverId: <%= this.server_id %>
+  volumeId: <%= this.volume_id %>

data/app/views/attachments/detach.txt.erb

@@ -1 +1 @@
-<%= this %> 
+Detached volume

data/app/views/attachments/index.txt.erb

@@ -1,4 +1,12 @@
+<% if this.empty? %>
+you don't have any attachments to this server, but you can create one by running:
+  rumm create attachment on server <server_name>
+<% else %>
+server id: <%= this.first.server_id %>
+Attachments:
 <% this.each do |attachment| %>
-id: <%= attachment.volume_id %>
-<% end %>
 
+  device: <%= attachment.device %>
+  volume id: <%= attachment.volume_id %>
+<% end %>
+<% end %>

data/app/views/attachments/show.txt.erb

@@ -1 +1,3 @@
-<%= this.display_name %> 
+device: <%= this.device %>
+server Id: <%= this.server_id %>
+volume Id: <%= this.volume_id %>

data/app/views/containers/create.txt.erb

@@ -1 +1 @@
-created container: <%= this.key %>
+Created container: <%= this.key %>

data/app/views/containers/destroy.txt.erb

@@ -1 +1 @@
-requested destruction of container <%= this %>
+Requested destruction of container <%= this %>

data/app/views/containers/index.txt.erb

@@ -1,3 +1,9 @@
+<% if this.empty? %>
+you don't have any containers, but you can create one by running:
+  rumm create container
+<% else %>
+Containers:
 <% this.each do |container| %>
-id: <%= container.key %>
+  id: <%= container.key %>
+<% end %>
 <% end %>

data/app/views/databases/create.txt.erb

@@ -1 +1 @@
-created database: <%= this.name %> 
+Created database: <%= this.name %> 

data/app/views/databases/destroy.txt.erb

@@ -1 +1 @@
-database instance <%= this.name %> queued for destruction 
+Destroyed database <%= this.name %>

data/app/views/databases/index.txt.erb

@@ -2,7 +2,8 @@
 you don't have any databases on this instance, but you can create one by running:
   rumm create database on dbinstance <instance_name>
 <% else %>
+Databases:
 <% this.each do |database| %>
-name: <%= database.name %> 
+name: <%= database.name %>
 <% end %>
 <% end %>

data/app/views/files/create.txt.erb

@@ -1,2 +1 @@
-created container: <%= this.key %> 
-
+Created file: <%= this.key %>

data/app/views/files/destroy.txt.erb

@@ -1 +1 @@
-requested destruction of container <%= this %> 
+Requested destruction of file <%= this %> 

data/app/views/files/download.txt.erb

@@ -1 +1 @@
-<%= this %>
+Downloaded file <%= this.inspect %>

data/app/views/files/index.txt.erb

@@ -1,4 +1,12 @@
+<% if this.empty? %>
+you don't have any files in this container, but you can create one by running:
+  rumm create file in container <container_name>
+<% else %>
+Files:
 <% this.each do |file| %>
-id: <%= file.key %> 
+  <%= file.key %>, size: <%= file.content_length %>
 <% end %>
 
+total number of files: <%= this.directory.count %>
+total number of bytes: <%= this.directory.bytes %>
+<% end %>

data/app/views/files/show.txt.erb

@@ -1,2 +1,3 @@
 <%= this.key %> 
-
+  length: <%= this.content_length %>
+  last modified: <%= this.last_modified %>

data/app/views/instances/create.txt.erb

@@ -1,2 +1,2 @@
-created database instance: <%= this.name %> 
+Created database instance: <%= this.name %> 
   id: <%= this.id %> 

data/app/views/instances/destroy.txt.erb

@@ -1 +1 @@
-requested destruction of instance <%= this.name %>
+Requested destruction of instance <%= this.name %>

data/app/views/instances/index.txt.erb

@@ -2,7 +2,8 @@
 you don't have any database instances, but you can create one by running:
   rumm create dbinstance
 <% else %>
+Database instances:
 <% this.each do |instance| %>
-<%= instance.name %> -> id: <%= instance.id %>, status: <%= instance.state %> 
+  <%= instance.name %> -> id: <%= instance.id %>, status: <%= instance.state %> 
 <% end %>
 <% end %>

data/app/views/instances/show.txt.erb

@@ -1 +1,4 @@
-<%= this.name %> -> id: <%= this.id %>, hostname: <%= this.hostname %>, status: <%= this.state %> 
+<%= this.name %>
+  id: <%= this.id %>
+  hostname: <%= this.hostname %>
+  status: <%= this.state %>

data/app/views/loadbalancers/create.txt.erb

@@ -1 +1 @@
-created load balancer: <%= this.name %>
+Created load balancer: <%= this.name %>

data/app/views/loadbalancers/destroy.txt.erb

@@ -1 +1 @@
-requested destruction of load balancer <%= this.name %> 
+Requested destruction of load balancer <%= this.name %> 

data/app/views/loadbalancers/index.txt.erb

@@ -2,6 +2,7 @@
 you don't have any loadbalancers, but you can create one by running:
   rumm create loadbalancer
 <% else %>
+  Loadbalancers:
 <% this.each do |loadbalancer| %>
 <%= loadbalancer.name %> -> id: <%= loadbalancer.id %>, 
 <% end %>

data/app/views/nodes/create.txt.erb

@@ -1,2 +1,2 @@
-created node: <%= this.id %> 
+Created node: <%= this.id %> 
 

data/app/views/nodes/destroy.txt.erb

@@ -1 +1 @@
-requested destruction of node <%= this %> 
+Destroyed node <%= this %> 

data/app/views/nodes/index.txt.erb

@@ -1,4 +1,9 @@
+<% if this.empty? %>
+you don't have any nodes on this load balancer, but you can create one by running:
+  rumm create node on loadbalancer <loadbalancer_name>
+<% else %>
+Nodes:
 <% this.each do |node| %>
-id: <%= node.id %>
+  id: <%= node.id %>, address: <%= node.address %>, condition: <%= node.condition %>, status: <%= node.status %>, weight: <%= node.weight %>
+<% end %>
 <% end %>
-