rumm 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: f22e1d300f41259fb41cf025ec307c54f085721f
-  data.tar.gz: f8b7f55420594715eabf95a79de2618e15d07395
-SHA512:
-  metadata.gz: 2fc311104ba0b6212b14799692362c6457091b44e0913ee5cd77e4e457cc284c24a79834a1f7233173078490e9c06877cf6cef0a6faab504823f31eb10cec1ee
-  data.tar.gz: 320fc0ff3e01760fbc05fc08a5562449c54651441a2ceb8339bebe1d011339c2e6135ec45d5577ec3160436f2af6785d1ddb4ab95df6a3f01907f07e1502e32c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NGFlNzA2ZWMyM2RmMjBkZWNlZTk5MzVmMzRkNjFmMGVkNGZiNjQ4Mw==
+  data.tar.gz: !binary |-
+    NWIwMWU3MjNhNjAxYTQ5MDVkNmNjMmMwM2MwYTBkZDkzZDk5ZDI2Zg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NzljYjhkYTc1ZDg3ZDNhZGI0NDMyNWNjOTIyN2I1M2JkNWU4NDY1OTI4NzI4
+    ZjU0NzMwMzk3ZTA5MDQ4NzViNThjNTQwZTQ2ZWUzNmNjYTFiNzliNGE3N2U0
+    MTkwM2U1ZDgwMTg0NjA2YjQ3NjczMTQ1OWNiOWVlODYzZDlkZmY=
+  data.tar.gz: !binary |-
+    MzgyNGNjMmIxYzRkOTZlM2EwYmQ1YWE3Y2FmMmIyNzZmOTYzOTUxM2MyZjNl
+    MDZiMDlmOWRlYmVhZTIzN2QxN2JjOWVkOTQ3ZGZjYjc2N2JmOTQxMGFjN2E1
+    ZTNkOWRjZmM1ZDNmMDRjODE3Y2I2ZTgyY2RlMjYyMWI4MjZhNjI=

data/.gitignore

@@ -15,4 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.idea/
+.idea/
+test

data/app/controllers/attachments_controller.rb

@@ -1,39 +1,49 @@
 class AttachmentsController < MVCLI::Controller
   requires :compute
   requires :volumes
+  requires :command
 
   def index
     #Maybe it would be best to give better information about the
     #attachments?
     #Maybe list the volume information rather than attachment info
+
     server.attachments.all
   end
 
   def attach
-    server.attach_volume volume
+    form = get_form Attachments::AttachDetachShowForm
+
+    server.attach_volume form.volume
   end
 
   def detach
-    id = volume.id
-    attachment(id).detach
+    form = get_form Attachments::AttachDetachShowForm
+
+    attachment( form.volume).detach
   end
 
   def show
-    id = volume.id
-    attachment id
+    form = get_form Attachments::AttachDetachShowForm
+
+    attachment(form.volume)
   end
 
   private
 
-  def volume
-    volumes.all.find {|v| v.display_name == params[:id]} or fail Fog::Errors::NotFound
+  def server
+    compute.servers.all.find {|server| server.name == params[:server_id]} or fail Fog::Errors::NotFound
   end
 
-  def server
-    compute.servers.all.find {|s| s.name == params[:server_id]} or fail Fog::Errors::NotFound
+  def get_form template
+    argv = MVCLI::Argv.new command.argv
+    form = template.new argv.options
+    form.validate!
+
+    form
   end
 
-  def attachment vol_id
-    server.attachments.find {|a| a.volume_id == vol_id} or fail Fog::Errors::NotFound
+  def attachment volume
+    server.attachments.find {|attachments| attachments.volume_id == volume.id} or fail Fog::Errors::NotFound
   end
 end

data/app/controllers/containers_controller.rb

@@ -1,15 +1,21 @@
 class ContainersController < MVCLI::Controller
   requires :containers
-  requires :naming
+  requires :command
 
   def index
     containers.all
   end
 
   def create
+    template = Containers::CreateForm
+    argv = MVCLI::Argv.new command.argv
+    form = template.new argv.options
+    form.validate!
+
     options = {
-      key: naming.generate_name(nil, nil)
+      key: form.name
     }
+
     containers.create options
   end
 

data/app/controllers/databases_controller.rb

@@ -1,7 +1,7 @@
 class DatabasesController < MVCLI::Controller
   requires :instances
   requires :databases
-  requires :naming
+  requires :command
 
   def index
     d = databases
@@ -16,9 +16,14 @@ class DatabasesController < MVCLI::Controller
   end
 
   def create
+    template = Databases::CreateForm
+    argv = MVCLI::Argv.new command.argv
+    form = template.new argv.options
+    form.validate!
+
     d = databases
     d.instance = instance
-    d.create ({name: naming.generate_name("d", "b")})
+    d.create ({name: form.name})
   end
 
   def destroy

data/app/controllers/files_controller.rb

@@ -1,14 +1,20 @@
 class FilesController < MVCLI::Controller
   requires :containers
+  requires :command
 
   def index
     container.all
   end
 
   def create
+    template = Files::CreateForm
+    argv = MVCLI::Argv.new command.argv
+    form = template.new argv.options
+    form.validate!
+
     options = {
       :key  => params[:id],
-      :body => File.open(File.expand_path "nouns.txt")
+      :body => form.file.to_s
     }
     container.create options
   end
@@ -22,7 +28,12 @@ class FilesController < MVCLI::Controller
   end
 
   def download
-    File.open((File.expand_path "download-" + params[:id]), 'w') do | f |
+    template = Files::DownloadForm
+    argv = MVCLI::Argv.new command.argv
+    form = template.new argv.options
+    form.validate!
+
+    File.open(form.destination.to_s, 'w') do | f |
       container.get(params[:id]) do | data, remaining, content_length |
         f.syswrite data
       end

data/app/controllers/instances_controller.rb

@@ -1,7 +1,7 @@
 class InstancesController < MVCLI::Controller
 
   requires :instances
-  requires :naming
+  requires :command
 
   def index
     instances.all
@@ -12,10 +12,16 @@ class InstancesController < MVCLI::Controller
   end
 
   def create
+    template = Instances::CreateForm
+    argv = MVCLI::Argv.new command.argv
+    form = template.new argv.options
+    form.validate!
+
+    #How expansive do we want these command line options to be?
     options = {
-      name: naming.generate_name('d', 'i'),
-      flavor_id: 1,
-      volume_size: 1,
+      name: form.name,
+      flavor_id: form.flavor,
+      volume_size: form.size
     }
     instances.create options
   end

data/app/controllers/nodes_controller.rb

@@ -1,6 +1,7 @@
 class NodesController < MVCLI::Controller
   requires :loadbalancers
   requires :nodes
+  requires :command
 
   def index
     n = nodes
@@ -15,13 +16,18 @@ class NodesController < MVCLI::Controller
   end
 
   def create
+    template = Nodes::CreateForm
+    argv = MVCLI::Argv.new command.argv
+    form = template.new argv.options
+    form.validate!
+
     n = nodes
     n.load_balancer = load_balancer
     options = {
-      address: params[:ip_address],
-      #address: "198.61.221.220",
-      condition: "ENABLED",
-      port: 80
+      address: form.address,
+      condition: form.condition,
+      port: form.port,
+      type: form.type
     }
     n.create options
   end
@@ -30,7 +36,7 @@ class NodesController < MVCLI::Controller
     n = nodes
     n.load_balancer = load_balancer
     find_node_in(n).destroy
-    :id
+    params[:id]
   end
 
   private

data/app/controllers/volumes_controller.rb

@@ -1,7 +1,6 @@
 class VolumesController < MVCLI::Controller
-  requires :compute
   requires :volumes
-  requires :naming
+  requires :command
 
   def index
     volumes.all
@@ -12,10 +11,15 @@ class VolumesController < MVCLI::Controller
   end
 
   def create
+    template = Volumes::CreateForm
+    argv = MVCLI::Argv.new command.argv
+    form = template.new argv.options
+    form.validate!
+
     options = {
-      display_name: naming.generate_name(nil, nil),
-      volume_type: "SATA",
-      size: 100
+      display_name: form.name,
+      volume_type: form.type,
+      size: form.size
     }
     volumes.create options
   end

data/app/forms/attachments/attach_detach_show_form.rb

@@ -0,0 +1,8 @@
+class Attachments::AttachDetachShowForm < MVCLI::Form
+  require "fog"
+
+  requires :volumes
+  requires :compute
+
+  input :volume, Fog::Volume,  required: true, decode: ->(s) { volumes.all.find {|v| v.display_name == s} or fail Fog::Errors::NotFound}
+end

data/app/forms/containers/create_form.rb

@@ -0,0 +1,5 @@
+class Containers::CreateForm < MVCLI::Form
+  requires :naming
+
+  input :name, String, default: ->() { naming.generate_name 'c', 'c' }
+end

data/app/forms/databases/create_form.rb

@@ -0,0 +1,6 @@
+class Databases::CreateForm < MVCLI::Form
+  requires :naming
+
+  input :name, String, default: ->() {naming.generate_name 'd', 'b'}
+
+end

data/app/forms/files/create_form.rb

@@ -0,0 +1,5 @@
+class Files::CreateForm < MVCLI::Form
+  input :file, Pathname, required: true, decode: ->(s) {Pathname(s)}
+
+  validates(:file, "File location must lead to a file") {|file| file.exist? }
+end

data/app/forms/files/download_form.rb

@@ -0,0 +1,5 @@
+class Files::DownloadForm < MVCLI::Form
+  input :destination, Pathname, required: true, decode: ->(s) {Pathname(s)}
+
+  validates(:destination, "File location must lead to an empty file") {|file| !File.exists? file}
+end

data/app/forms/instances/create_form.rb

@@ -0,0 +1,11 @@
+class Instances::CreateForm < MVCLI::Form
+  requires :naming
+
+  input :name, String, default: ->() { naming.generate_name 'd', 'i' }
+  input :flavor, Integer, default: 1
+  input :size, Integer, default: 1
+
+  validates(:flavor, "must be between 1 and 6") { |id| (1..6) === id }
+
+  validates(:size, "must be between 1 and 150") { |size| (1..150) === size }
+end

data/app/forms/loadbalancers/create_form.rb

@@ -17,12 +17,12 @@ class Loadbalancers::CreateForm < MVCLI::Form
     input :type, String, default: 'PRIMARY', decode: :upcase
     input :condition, String, default: 'ENABLED', decode: :upcase
 
-    validates(:port, "port must be between 0 and 65,535") {|port| port >= 0 && port <= 65535}
+    validates(:port, "must be between 0 and 65,535") {|port| port >= 0 && port <= 65535}
     validates(:type, "invalid type") {|type| ['PRIMARY', 'SECONDARY'].member? type}
     validates(:condition, "invalid condition") {|c| ['ENABLED', 'DISABLED'].member? c}
   end
 
-  validates(:port, "port must be between 0 and 65,535") {|port| port >=0 && port < 65535}
+  validates(:port, "must be between 0 and 65,535") {|port| port >=0 && port < 65535}
 
   validates(:nodes, "at least one node must be enabled", each: false) { |nodes|
     nodes.any? {|n| n.condition == 'ENABLED'}

data/app/forms/nodes/create_form.rb

@@ -0,0 +1,12 @@
+require "ipaddr"
+
+class Nodes::CreateForm < MVCLI::Form
+    input :address, String, required: true, decode: ->(s) { URI('').hostname = s }
+    input :port, Integer, default: 80, decode: ->(s) {Integer s}
+    input :type, String, default: 'PRIMARY', decode: :upcase
+    input :condition, String, default: 'ENABLED', decode: :upcase
+
+    validates(:port, "must be between 0 and 65,535") {|port| port >= 0 && port <= 65535}
+    validates(:type, "invalid type") {|type| ['PRIMARY', 'SECONDARY'].member? type}
+    validates(:condition, "invalid condition") {|c| ['ENABLED', 'DISABLED'].member? c}
+end

data/app/forms/users/create_form.rb

@@ -4,7 +4,7 @@ class Users::CreateForm < MVCLI::Form
   input :databases, [Map], required: true, decode: ->(s) {{name: s}}
   input :host, String
 
-  validates(:host, "host must be a valid ip address or %") {|host|
+  validates(:host, "must be a valid ip address or %") {|host|
     host == "%" or IPAddr.new(host) rescue nil
   }
 end

data/app/forms/volumes/create_form.rb

@@ -0,0 +1,10 @@
+class Volumes::CreateForm < MVCLI::Form
+  requires :naming
+
+  input :name, String, default: ->() { naming.generate_name 'nil', 'nil' }
+  input :type, String, default: "SATA"
+  input :size, Integer, default: 100
+
+  validates(:type, "must either be SATA or SSD"){ |type| type == "SATA" or "SSD" }
+  validates(:size, "must be between 100 and 1024"){ |size| (100..1024) === size }
+end

data/app/help/create_attachment_on_server.txt

@@ -0,0 +1,14 @@
+Usage:
+    rumm create 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 attached to
+
+Description:
+    Attaches the specified volume to the named server.
+
+Examples:
+    rumm create attachment on server superordinate-struthioniformes --volume colorful-caterpillar

data/app/help/create_container.txt

@@ -2,6 +2,7 @@ Usage:
     rumm create container
 
 Options:
+    -n, --name STRING                  # Name to give the new container
     none
 
 Arguments:

data/app/help/{create_database.txt → create_database_on_dbinstance.txt}

@@ -1,15 +1,15 @@
 Usage:
-    rumm create database on dbinstance INSTANCE_ID
+    rumm create database on dbinstance INSTANCE_ID [--name STRING]
 
 Options:
-    none
+    -n, --name STRING           # Name to give the new database
 
 Arguments:
     INSTANCE_ID: STRING         # Name of the DB instance on which to create the database
 
 Description:
     Creates a new database on the specified DB instance. The name of the
-    database will be automatically generated.
+    database will be automatically generated if none is provided.
 
 Examples:
     rumm create database on dbinstance departmental-ichthyologist

data/app/help/create_dbinstance.txt

@@ -1,15 +1,15 @@
 Usage:
-    rumm create dbinstance
+    rumm create dbinstance [--name STRING]
 
 Options:
-    none
+    -n, --name STRING                  # Name to give the new server
 
 Arguments:
     none
 
 Description:
     Creates a new DB instance. A name for the DB instance will be
-    automatically generated.
+    automatically generated if one is not provided.
 
 Examples:
     rumm create dbinstance

data/app/help/create_file_in_container.txt

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