fog-maestrodev 1.18.0.20131121075022 → 1.18.0.20131122203507

data/lib/fog/rackspace/examples/queues/delete_queue.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+
+# This example demonstrates deleting a queue with the Rackpace Open Cloud
+
+require 'rubygems' #required for Ruby 1.8.x
+require 'fog'
+
+def get_user_input(prompt)
+  print "#{prompt}: "
+  gets.chomp
+end
+
+def select_queue(queues)
+  abort "\nThere are not any queues to delete in the Chicago region. Try running create_queue.rb\n\n" if queues.empty?
+
+  puts "\nSelect Queue To Delete:\n\n"
+  queues.each_with_index do |queue, i|
+    puts "\t #{i}. #{queue.name}"
+  end
+
+  delete_str = get_user_input "\nEnter Queue Number"
+  queues[delete_str.to_i]
+end
+
+# Use username defined in ~/.fog file, if absent prompt for username.
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_username
+  Fog.credentials[:rackspace_username] || get_user_input("Enter Rackspace Username")
+end
+
+# Use api key defined in ~/.fog file, if absent prompt for api key
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_api_key
+  Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key")
+end
+
+# create Queue Service
+service = Fog::Rackspace::Queues.new({
+  :rackspace_username   => rackspace_username,
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
+})
+
+# retrieve list of queues
+queues = service.queues
+
+# prompt for queue to delete
+queue = select_queue(queues)
+
+# delete queue
+queue.destroy
+
+puts "\nQueue #{queue.name} has been destroyed\n"

data/lib/fog/rackspace/examples/queues/list_messages.rb

@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+
+# This example demonstrates listing messages in a queue with the Rackpace Open Cloud
+
+require 'rubygems' #required for Ruby 1.8.x
+require 'fog'
+
+def get_user_input(prompt)
+  print "#{prompt}: "
+  gets.chomp
+end
+
+def get_user_boolean(prompt)
+  str = get_user_input(prompt)
+  return false unless str
+  str.match(/y(es)?/i) ? true : false
+end
+
+def select_queue(queues)
+  abort "\nThere are not any queues to post a message to in the Chicago region. Try running create_queue.rb\n\n" if queues.empty?
+
+  puts "\nSelect Queue:\n\n"
+  queues.each_with_index do |queue, i|
+    puts "\t #{i}. #{queue.name}"
+  end
+
+  delete_str = get_user_input "\nEnter Queue Number"
+  queues[delete_str.to_i]
+end
+
+# Use username defined in ~/.fog file, if absent prompt for username.
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_username
+  Fog.credentials[:rackspace_username] || get_user_input("Enter Rackspace Username")
+end
+
+# Use api key defined in ~/.fog file, if absent prompt for api key
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_api_key
+  Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key")
+end
+
+# create Queue Service
+service = Fog::Rackspace::Queues.new({
+  :rackspace_username   => rackspace_username,
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
+})
+
+# retrieve list of queues
+queues = service.queues
+
+# prompt for queue to delete
+queue = select_queue(queues)
+
+queue.messages.echo = get_user_boolean "Do you want to include your own messages? [y/N]"
+
+queue.messages.include_claimed = get_user_boolean "Do you want to include claimed messages? [y/N]"
+
+puts "\n\nThe following messages are in the '#{queue.name}' queue:\n\n"
+
+queue.messages.each do |message|
+  puts message.inspect
+end

data/lib/fog/rackspace/examples/queues/post_message.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+
+# This example demonstrates posting a message to a queue with the Rackpace Open Cloud
+
+require 'rubygems' #required for Ruby 1.8.x
+require 'fog'
+
+def get_user_input(prompt)
+  print "#{prompt}: "
+  gets.chomp
+end
+
+def select_queue(queues)
+  abort "\nThere are not any queues to post a message to in the Chicago region. Try running create_queue.rb\n\n" if queues.empty?
+
+  puts "\nSelect Queue:\n\n"
+  queues.each_with_index do |queue, i|
+    puts "\t #{i}. #{queue.name}"
+  end
+
+  delete_str = get_user_input "\nEnter Queue Number"
+  queues[delete_str.to_i]
+end
+
+# Use username defined in ~/.fog file, if absent prompt for username.
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_username
+  Fog.credentials[:rackspace_username] || get_user_input("Enter Rackspace Username")
+end
+
+# Use api key defined in ~/.fog file, if absent prompt for api key
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_api_key
+  Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key")
+end
+
+# create Queue Service
+service = Fog::Rackspace::Queues.new({
+  :rackspace_username   => rackspace_username,
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
+})
+
+# retrieve list of queues
+queues = service.queues
+
+# prompt for queue to delete
+queue = select_queue(queues)
+
+# prompt for queue message
+message = get_user_input "Enter Queue Message"
+
+# time to live TTL = 1 hour
+ttl = 3600
+
+# post message to queue
+queue.messages.create :body => message, :ttl => ttl
+
+puts "The message has been successfully posted"

data/lib/fog/rackspace/models/queues/claim.rb

@@ -12,6 +12,8 @@ module Fog
         attribute :limit
         attribute :messages
 
+        alias :id :identity
+
         def save
           if identity.nil?
             create

data/lib/fog/rackspace/models/queues/message.rb

@@ -12,12 +12,12 @@ module Fog
         attribute :claim_id
 
         def identity
-          if href
-            href.split('/').last
-          else
-            nil
-          end
+          return nil unless href
+
+          match = href.match(/(\/(\w+))*\??/)
+          match ? match[-1] : nil
         end
+        alias :id :identity
 
         def save
           requires :queue, :client_id, :body, :ttl

data/lib/fog/rackspace/models/queues/queue.rb

@@ -33,7 +33,7 @@ module Fog
 
         #Helper method to enqueue a single message
         def enqueue(body, ttl, options = {})
-          messages.create(options.merge(options.merge({:body => body, :ttl => ttl})))
+          messages.create(options.merge({:body => body, :ttl => ttl}))
         end
 
         #Helper method to claim (dequeue) a single message, including destroying it

data/lib/fog/rackspace/service.rb

@@ -66,7 +66,7 @@ module Fog
            Fog::Rackspace.json_response?(response)
           begin
             response.body = Fog::JSON.decode(response.body)
-          rescue MultiJson::DecodeError => e
+          rescue Fog::JSON::DecodeError => e
             Fog::Logger.warning("Error Parsing response json - #{e}")
             response.body = {}
           end

data/lib/fog/riakcs.rb

@@ -71,9 +71,9 @@ module Fog
 
     module UserUtils
       def update_riakcs_user(key_id, user)
-        response = @s3_connection.put_object('riak-cs', "user/#{key_id}", MultiJson.encode(user), { 'Content-Type' => 'application/json' })
+        response = @s3_connection.put_object('riak-cs', "user/#{key_id}", Fog::JSON.encode(user), { 'Content-Type' => 'application/json' })
         if !response.body.empty?
-          response.body = MultiJson.decode(response.body)
+          response.body = Fog::JSON.decode(response.body)
         end
         response
       end

data/lib/fog/riakcs/provisioning.rb

@@ -47,8 +47,6 @@ module Fog
         include Utils
 
         def initialize(options = {})
-          require 'multi_json'
-
           configure_uri_options(options)
           @riakcs_access_key_id     = options[:riakcs_access_key_id]
           @riakcs_secret_access_key = options[:riakcs_secret_access_key]
@@ -89,7 +87,7 @@ module Fog
             end
           end
           if !response.body.empty? && parse_response
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

data/lib/fog/riakcs/requests/provisioning/create_user.rb

@@ -3,7 +3,7 @@ module Fog
     class Provisioning
       class Real
         def create_user(email, name, options = {})
-          payload = MultiJson.encode({ :email => email, :name => name })
+          payload = Fog::JSON.encode({ :email => email, :name => name })
           headers = { 'Content-Type' => 'application/json' }
 
           if(options[:anonymous])
@@ -20,7 +20,7 @@ module Fog
               if !response.body.empty?
                 case response.headers['Content-Type']
                 when 'application/json'
-                  response.body = MultiJson.decode(response.body)
+                  response.body = Fog::JSON.decode(response.body)
                 end
               end
               response

data/lib/fog/riakcs/requests/provisioning/get_user.rb

@@ -7,7 +7,7 @@ module Fog
 
         def get_user(key_id)
           response = @s3_connection.get_object('riak-cs', "user/#{key_id}", { 'Accept' => 'application/json' })
-          response.body = MultiJson.decode(response.body)
+          response.body = Fog::JSON.decode(response.body)
           response
         end
       end

data/lib/fog/riakcs/requests/provisioning/list_users.rb

@@ -10,7 +10,7 @@ module Fog
 
           boundary      = extract_boundary(response.headers['Content-Type'])
           parts         = parse(response.body, boundary)
-          decoded       = parts.map { |part| MultiJson.decode(part[:body]) }
+          decoded       = parts.map { |part| Fog::JSON.decode(part[:body]) }
 
           response.body = decoded.flatten
 

data/lib/fog/riakcs/requests/usage/get_usage.rb

@@ -37,7 +37,7 @@ module Fog
           response = @connection.get_object('riak-cs', ["usage", request_uri(access_key_id, options)].join("/"))
 
           if !response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

data/lib/fog/riakcs/usage.rb

@@ -41,8 +41,6 @@ module Fog
         include Utils
 
         def initialize(options = {})
-          require 'multi_json'
-
           configure_uri_options(options)
           @riakcs_access_key_id     = options[:riakcs_access_key_id]
           @riakcs_secret_access_key = options[:riakcs_secret_access_key]

data/lib/fog/vsphere/compute.rb

@@ -80,6 +80,7 @@ module Fog
       request :list_vm_customvalues
       request :list_customfields
       request :get_vm_first_scsi_controller
+      request :set_vm_customvalue
 
       module Shared
 

data/lib/fog/vsphere/models/compute/datastore.rb

@@ -12,6 +12,7 @@ module Fog
         attribute :freespace
         attribute :accessible # reachable by at least one hypervisor
         attribute :capacity
+        attribute :uncommitted
 
         def to_s
           name

data/lib/fog/vsphere/requests/compute/list_datastores.rb

@@ -19,13 +19,14 @@ module Fog
 
         def datastore_attributes datastore, datacenter
           {
-            :id         => managed_obj_id(datastore),
-            :name       => datastore.name,
-            :accessible => datastore.summary.accessible,
-            :type       => datastore.summary.type,
-            :freespace  => datastore.summary.freeSpace,
-            :capacity   => datastore.summary.capacity,
-            :datacenter => datacenter,
+            :id          => managed_obj_id(datastore),
+            :name        => datastore.name,
+            :accessible  => datastore.summary.accessible,
+            :type        => datastore.summary.type,
+            :freespace   => datastore.summary.freeSpace,
+            :capacity    => datastore.summary.capacity,
+            :uncommitted => datastore.summary.uncommitted,
+            :datacenter  => datacenter,
           }
         end
 
@@ -37,4 +38,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/vsphere/requests/compute/set_vm_customvalue.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def set_vm_customvalue(vm_id, key, value)
+          vm_ref = get_vm_ref(vm_id)
+          vm_ref.setCustomValue(:key => key, :value => value)
+        end
+
+      end
+      class Mock
+        def set_vm_customvalue(vm_id, key, value)
+          nil
+        end
+      end
+    end
+  end
+end
+

data/lib/tasks/changelog_task.rb

@@ -14,7 +14,6 @@ module Fog
           changelog << ('=' * changelog[0].length)
           changelog << ''
 
-          require 'multi_json'
           github_repo_data = Fog::JSON.decode(Excon.get('https://api.github.com/repos/fog/fog', :headers => {'User-Agent' => 'geemus'}).body)
           data = github_repo_data.reject {|key, value| !['forks', 'open_issues', 'watchers'].include?(key)}
           github_collaborator_data = Fog::JSON.decode(Excon.get('https://api.github.com/repos/fog/fog/collaborators', :headers => {'User-Agent' => 'geemus'}).body)

data/tests/google/models/compute/disk_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests("Fog::Compute[:google] | disk model", ['google']) do
+
+  model_tests(Fog::Compute[:google].disks, {:name => 'fogdiskname', :zone_name => 'us-central1-a'})
+
+end

data/tests/google/models/compute/disks_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests("Fog::Compute[:google] | disks", ['google']) do
+
+  collection_tests(Fog::Compute[:google].disks, {:name => 'fogdiskname', :zone_name => 'us-central1-a'})
+
+end

data/tests/google/models/compute/server_tests.rb

@@ -1,5 +1,7 @@
 Shindo.tests("Fog::Compute[:google] | server model", ['google']) do
 
+  model_tests(Fog::Compute[:google].disks, {:name => 'fogservername', :zone_name => 'us-central1-a', :machine_type => 'n1-standard-1'})
+
   tests('servers') do
     @instance = nil
     test('#bootstrap') do
@@ -13,6 +15,7 @@ Shindo.tests("Fog::Compute[:google] | server model", ['google']) do
     end
 
     test('#ssh') do
+      pending if Fog.mocking?
       @instance.ssh("uname") == "Linux"
     end
 

data/tests/google/models/compute/servers_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests("Fog::Compute[:google] | servers", ['google']) do
+
+  collection_tests(Fog::Compute[:google].servers, {:name => 'fogservername', :zone_name => 'us-central1-a', :machine_type => 'n1-standard-1'})
+
+end

data/tests/google/requests/compute/disk_tests.rb

@@ -65,10 +65,11 @@ Shindo.tests('Fog::Compute[:google] | disk requests', ['google']) do
     disk_name = 'new-disk-test'
     disk_size = '2'
     zone_name = 'us-central1-a'
+    image_name = 'centos-6-v20130813'
 
     # These will all fail if errors happen on insert
     tests("#insert_disk").formats(@insert_disk_format) do
-      @google.insert_disk(disk_name, disk_size, zone_name).body
+      @google.insert_disk(disk_name, zone_name, image_name).body
     end
 
     tests("#get_disk").formats(@get_disk_format) do