project-fifo-ruby 0.1.0 → 0.2.0

data/lib/project-fifo.rb

@@ -1,5 +1,6 @@
 require 'rest_client'
 require 'json'
+require 'hashie'
 require 'project-fifo/resource'
 require 'project-fifo/vm'
 require 'project-fifo/dataset'
@@ -77,6 +78,7 @@ class ProjectFifo
                       end
                       e.response
                     end
-    JSON.parse(response_body)
+    result = JSON.parse(response_body)
+    return result.is_a?(Hash) ? Hashie::Mash.new(result) : result
   end
 end

data/lib/project-fifo/resource.rb

@@ -1,3 +1,5 @@
+require 'hash_validator'
+
 class ProjectFifo
   class Resource
     
@@ -26,6 +28,8 @@ class ProjectFifo
     end
     
     def create(data)
+      validator = HashValidator.validate(data, validations)
+      raise(ArgumentError, validator.errors) unless validator.valid?
       fifo.post(namespace, data)
     end
     
@@ -39,7 +43,11 @@ class ProjectFifo
     
     def put(uuid, payload)
       fifo.put(namespace + '/' + uuid, payload)
+    end 
+
+    protected
+    def validations()
+      return {}
     end
-    
   end
 end

data/lib/project-fifo/vm.rb

@@ -1,6 +1,9 @@
+
+
 class ProjectFifo
+  
   class VM < ProjectFifo::Resource
-    
+          
     def initialize(fifo)
       super(fifo, 'vms')
     end
@@ -9,6 +12,22 @@ class ProjectFifo
       define_method(act) { |uuid, force| action(uuid, act, force) }
     end
     
+     VALIDATIONS = {
+      package: 'string',
+      dataset: 'string',
+      config: {
+        alias: 'string',
+        networks: {
+          net0: 'string'
+        }
+      }
+    }
+    
+    protected
+    def validations()
+      return VALIDATIONS
+    end
+    
     private
     
     def action(uuid, act, force = false)

data/project-fifo-ruby.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "project-fifo-ruby"
-  spec.version       = '0.1.0'
+  spec.version       = '0.2.0'
   spec.authors       = [ "Brian Akins" ]
   spec.email         = [ "brian@akins.org" ]
   spec.description   = %q{A simple incomplete project-fifo client API}
@@ -16,4 +16,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 1.9.1"
   spec.add_dependency("rest-client", "~> 1.6")
+  spec.add_dependency("hashie", "~> 2.0")
+  spec.add_dependency("json")
+  spec.add_dependency("hash_validator")
 end

data/test.rb

@@ -6,9 +6,10 @@ fifo = ProjectFifo.new("http://192.168.1.100/api/0.1.0/", "admin", "admin")
 
 fifo.connect
 
-#fifo.vms.list.each do |vm|
-#  pp fifo.vms[vm]
-#end
+fifo.vms.list.each do |id|
+  vm = fifo.vms[id]
+  pp vm.config.dataset
+end
 
 package = fifo.packages.list.first
 dataset = fifo.datasets.list.first
@@ -29,12 +30,13 @@ data = {
 
 
 vm = fifo.vms.create(data)
-
-pp vm
+exit
+#pp vm
 
 id = vm['uuid']
 sleep 10
 
+exit
 fifo.vms.stop(id, true)
 
 sleep 10

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: project-fifo-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -27,6 +27,54 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hash_validator
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple incomplete project-fifo client API
 email:
 - brian@akins.org