brightbox-cli 0.14.1 → 0.15.0

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/create_zone.rb

@@ -46,7 +46,7 @@ module Fog
         #     * 'restrict-axfr'<~String>    
         #   * 'status'<~Integer> - 201 if successful        
         
-        def create_zone( domain, default_ttl, ns_type, options = {})
+        def create_zone(domain, default_ttl, ns_type, options = {})
 
           optional_tags= ''
           options.each { |option, value|
@@ -84,6 +84,49 @@ module Fog
         end
 
       end
+
+      class Mock # :nodoc:all
+        def create_zone(domain, default_ttl, ns_type, options = {})
+          now = Time.now
+          zone = {
+            'id'                    => rand(10000000),
+            'domain'                => domain,
+            'created-at'            => now,
+            'updated-at'            => now,
+            'ns1'                   => options[:ns1],
+            'nx-ttl'                => options[:nx_ttl].to_i,
+            'default-ttl'           => default_ttl.to_i,
+            'ns-type'               => ns_type,
+            'hosts'                 => options[:hosts] || [],
+            'hosts-count'           => (options[:hosts] || []).size,
+            'notes'                 => options[:notes],
+            'slave-nameservers'     => options[:slave_nameservers],
+            'tag-list'              => options[:tag_list]
+          }
+
+          response = Excon::Response.new
+
+          if self.data[:zones].any? {|z| z['domain'] == zone['domain'] }
+            response.status = 422
+            response.body = {
+              'errors' => [
+                'error' => 'Domain is already associated to another account',
+                'error' => 'Domain already exists. If it was just deleted, wait a minute and try again'
+              ]
+            }
+
+          else
+            self.data[:zones] << zone
+
+            response.status = 201
+            response.headers = { 'Location' => "http://ns.zerigo.com/api/1.1/zones/#{zone['id']}" }
+            response.body = zone['hosts'].empty? ? zone.merge(:hosts => nil) : zone # Zerigo returns nil, not an empty list only on the create command.
+          end
+
+          response
+        end
+      end
+
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/delete_host.rb

@@ -19,6 +19,25 @@ module Fog
         end
 
       end
+
+      class Mock # :nodoc:all
+        def delete_host(host_id)
+          host = find_host(host_id)
+
+          response = Excon::Response.new
+
+          if host
+            zone = find_by_zone_id(host['zone-id'])
+            zone['hosts'].delete(host)
+
+            response.status = 200
+          else
+            response.status = 404
+          end
+
+          response
+        end
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/delete_zone.rb

@@ -20,6 +20,23 @@ module Fog
         end
 
       end
+
+      class Mock # :nodoc:all
+        def delete_zone(zone_id)
+          zone = find_by_zone_id(zone_id)
+
+          response = Excon::Response.new
+
+          if zone
+            self.data[:zones].delete(zone)
+            response.status = 200
+          else
+            response.status = 404
+          end
+
+          response
+        end
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/find_hosts.rb

@@ -29,7 +29,7 @@ module Fog
         #       * 'zone-id'<~String>
         #   * 'status'<~Integer> - 200 indicated success
         #
-        def find_hosts( fqdn, zone_id = nil)
+        def find_hosts(fqdn, zone_id = nil)
           if zone_id.nil?
             #look for matching host across all zones
             request(
@@ -50,6 +50,27 @@ module Fog
         end
 
       end
+
+      class Mock # :nodoc:all
+        def find_hosts(fqdn, zone_id = nil)
+          response = Excon::Response.new
+
+          zone = find_by_zone_id(zone_id)
+          if zone_id && !zone
+            response.status = 404
+          else
+            hosts = zone ? zone['hosts'].select { |z| z['fqdn'] == fqdn } :
+                           self.data[:zones].collect { |z| z['hosts'].find { |h| h['fqdn'] == fqdn } }.compact
+
+            response.status = 200
+            response.body = {
+              'hosts' => hosts
+            }
+          end
+
+          response
+        end
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/get_host.rb

@@ -24,7 +24,7 @@ module Fog
         #     * 'updated-at'<~String>
         #     * 'zone-id'<~String>
         #   * 'status'<~Integer> - 200 indicates success
-        def get_host( host_id)
+        def get_host(host_id)
           request(
             :expects  => 200,
             :method   => 'GET',
@@ -34,6 +34,23 @@ module Fog
         end
 
       end
+
+      class Mock # :nodoc:all
+        def get_host(host_id)
+          host = find_host(host_id)
+
+          response = Excon::Response.new
+
+          if host
+            response.status = 200
+            response.body = host
+          else
+            response.status = 404
+          end
+
+          response
+        end
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/get_zone.rb

@@ -34,16 +34,33 @@ module Fog
         #     * 'restrict-axfr'<~String>    
         #   * 'status'<~Integer> - 200 indicates success
         
-        def get_zone(zone)
+        def get_zone(zone_id_or_domain)
           request(
             :expects  => 200,
             :method   => 'GET',
             :parser   => Fog::Parsers::DNS::Zerigo::GetZone.new,
-            :path     => "/api/1.1/zones/#{zone}.xml"
+            :path     => "/api/1.1/zones/#{zone_id_or_domain}.xml"
           )
         end
 
       end
+
+      class Mock # :nodoc:all
+        def get_zone(zone_id_or_domain)
+          zone = find_by_zone_id(zone_id_or_domain) || find_by_domain(zone_id_or_domain)
+
+          response = Excon::Response.new
+
+          if zone
+            response.status = 200
+            response.body = zone
+          else
+            response.status = 404
+          end
+
+          response
+        end
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/get_zone_stats.rb

@@ -31,6 +31,29 @@ module Fog
         end
 
       end
+
+      class Mock # :nodoc:all
+        def get_zone_stats(zone_id)
+          zone = find_by_zone_id(zone_id)
+
+          response = Excon::Response.new
+
+          if zone
+            response.status = 200
+            response.body = {
+              'id' => zone,
+              'domain' => zone['domain'],
+              'period-begin' => zone['created-at'].strftime("%F"),
+              'period-end' => Date.today.to_s,
+              'queries' => 0
+            }
+          else
+            response.status = 404
+          end
+
+          response
+        end
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/list_hosts.rb

@@ -25,7 +25,7 @@ module Fog
         #       * 'updated-at'<~String>
         #       * 'zone-id'<~String>
         # * 'status'<~Integer> - 200 indicates success
-        def list_hosts( zone_id)
+        def list_hosts(zone_id)
           request(
             :expects  => 200,
             :method   => 'GET',
@@ -35,6 +35,25 @@ module Fog
         end
 
       end
+
+      class Mock # :nodoc:all
+        def list_hosts(zone_id)
+          zone = find_by_zone_id(zone_id)
+
+          response = Excon::Response.new
+
+          if zone
+            response.status = 200
+            response.body = {
+              'hosts' => zone['hosts']
+            }
+          else
+            response.status = 404
+          end
+
+          response
+        end
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/list_zones.rb

@@ -40,6 +40,21 @@ module Fog
         end
 
       end
+
+      class Mock # :nodoc:all
+
+        def list_zones
+          response = Excon::Response.new
+
+          response.status = 200
+          response.body = {
+            'zones' => self.data[:zones]
+          }
+
+          response
+        end
+
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/update_host.rb

@@ -18,7 +18,7 @@ module Fog
         # * response<~Excon::Response>: 
         #   * 'status'<~Integer> - 200 for success
         #
-        def update_host( host_id, options = {})
+        def update_host(host_id, options = {})
 
           optional_tags= ''
           options.each { |option, value|
@@ -47,6 +47,25 @@ module Fog
         end
 
       end
+
+      class Mock # :nodoc:all
+        def update_host(host_id, options = {})
+          host = find_host(host_id)
+
+          response = Excon::Response.new
+
+          if host
+            options.each { |k, v| host[k.to_s] = v } # Deal with symbols in requests but strings in responses.
+            host['updated-at'] = Time.now
+
+            response.status = 200
+          else
+            response.status = 404
+          end
+
+          response
+        end
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/update_zone.rb

@@ -24,7 +24,7 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * 'status'<~Integer> - 200 for success
-        def update_zone( zone_id, options = {})
+        def update_zone(zone_id, options = {})
 
           optional_tags= ''
           options.each { |option, value|
@@ -65,6 +65,25 @@ module Fog
         end
 
       end
+
+      class Mock # :nodoc:all
+        def update_zone(zone_id, options = {})
+          zone = find_by_zone_id(zone_id)
+
+          response = Excon::Response.new
+
+          if zone
+            options.each { |k, v| zone[k.to_s] = v } # Deal with symbols in requests but strings in responses.
+            zone['updated-at'] = Time.now
+
+            response.status = 200
+          else
+            response.status = 404
+          end
+
+          response
+        end
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo.rb

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:dns, 'zerigo/dns')
+    service(:dns, 'zerigo/dns', 'DNS')
 
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.11.0'
+    VERSION = '1.0.0'
   end
 
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/cloud_watch/alarm_data_tests.rb

@@ -0,0 +1,40 @@
+Shindo.tests("AWS::CloudWatch | alarm_data", ['aws', 'cloudwatch']) do
+
+  tests('success') do
+    tests("#all").succeeds do
+      Fog::AWS[:cloud_watch].alarm_data.all
+    end
+    
+    alarm_name_prefix = {'AlarmNamePrefix'=>'tmp'}
+	tests("#all_by_prefix").succeeds do
+      Fog::AWS[:cloud_watch].alarm_data.all(alarm_name_prefix)
+    end
+    
+    namespace = 'AWS/EC2'
+    metric_name = 'CPUUtilization'
+
+    tests("#get").succeeds do
+      Fog::AWS[:cloud_watch].alarm_data.get(namespace, metric_name).to_json
+    end
+    
+    new_attributes = {
+      :alarm_name => 'tmp-alarm',
+      :comparison_operator => 'GreaterThanOrEqualToThreshold',
+      :evaluation_periods => 1,
+      :metric_name => 'tmp-metric-alarm',
+      :namespace => 'fog-0.11.0',
+      :period => 60,
+      :statistic => 'Sum',
+      :threshold => 5
+      }
+    tests('#new').returns(new_attributes) do
+      Fog::AWS[:cloud_watch].alarm_data.new(new_attributes).attributes
+    end
+    
+    tests('#create').returns(new_attributes) do
+      Fog::AWS[:cloud_watch].alarm_data.create(new_attributes).attributes
+    end
+    
+  end
+
+end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/cloud_watch/alarm_history_tests.rb

@@ -0,0 +1,20 @@
+Shindo.tests("AWS::CloudWatch | alarm_histories", ['aws', 'cloudwatch']) do
+
+  tests('success') do
+    tests("#all").succeeds do
+      Fog::AWS[:cloud_watch].alarm_histories.all
+    end
+    
+  new_attributes = {
+      :alarm_name => 'tmp-alarm',
+      :end_date => '',
+      :history_item_type => 'StateUpdate',
+      :max_records => 1,
+      :start_date => ''
+    }
+    tests('#new').returns(new_attributes) do
+      Fog::AWS[:cloud_watch].alarm_histories.new(new_attributes).attributes
+    end
+  end
+
+end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/compute/server_tests.rb

@@ -47,6 +47,8 @@ Shindo.tests("Fog::Compute[:aws] | monitor", ['aws']) do
   tests('tags') do
     @instance = Fog::Compute[:aws].servers.create(:tags => {'key' => 'value'})
 
+    @instance.wait_for { ready? }
+
     tests('@instance.reload.tags').returns({'key' => 'value'}) do
       @instance.reload.tags
     end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/elasticache/cluster_tests.rb

@@ -0,0 +1,30 @@
+Shindo.tests('AWS::Elasticache | cache clusters', ['aws', 'elasticache']) do
+  cluster_params = {
+    :id               => "fog-test-cluster-#{rand(999).to_s}",
+    :node_type        => 'cache.m1.large',
+    :security_groups  => ['default'],
+    :engine           => 'memcached',
+    :num_nodes        => 1
+  }
+
+  pending if Fog.mocking?
+
+  Formatador.display_line "Creating cluster #{cluster_params[:id]}..."
+  model_tests(AWS[:elasticache].clusters, cluster_params, false) do
+    @instance.reload  # Reload to get the cluster info from AWS
+    Formatador.display_line "Waiting for #{@instance.id} "+
+      "to become available (#{@instance.status})..."
+    @instance.wait_for {ready?}
+  end
+
+  # Single model is still deleting, so re-randomize the cluster ID
+  cluster_params[:id] = "fog-test-cluster-#{rand(999).to_s}"
+  Formatador.display_line "Creating cluster #{cluster_params[:id]}..."
+  collection_tests(AWS[:elasticache].clusters, cluster_params, false) do
+    @instance.reload  # Reload to get the cluster info from AWS
+    Formatador.display_line "Waiting for #{@instance.id} "+
+      "to become available (#{@instance.status})..."
+    @instance.wait_for {ready?}
+  end
+
+end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/elasticache/parameter_groups_tests.rb

@@ -0,0 +1,17 @@
+Shindo.tests('AWS::Elasticache | parameter groups', ['aws', 'elasticache']) do
+  group_name = 'fog-test'
+  description = 'Fog Test'
+
+  pending if Fog.mocking?
+
+  model_tests(
+    AWS[:elasticache].parameter_groups,
+    {:id => group_name, :description => description}, false
+  )
+
+  collection_tests(
+    AWS[:elasticache].parameter_groups,
+    {:id => group_name, :description => description}, false
+  )
+
+end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/elasticache/security_groups_tests.rb

@@ -0,0 +1,52 @@
+Shindo.tests('AWS::Elasticache | security groups', ['aws', 'elasticache']) do
+  group_name = 'fog-test'
+  description = 'Fog Test'
+
+  pending if Fog.mocking?
+
+  model_tests(
+  AWS[:elasticache].security_groups,
+  {:id => group_name, :description => description}, false
+  ) do
+
+    # An EC2 group to authorize
+    ec2_group = Fog::Compute.new(:provider => 'AWS').security_groups.create(
+      :name => 'fog-test-elasticache', :description => 'fog test'
+    )
+
+    # Reload to get the instance owner_id
+    @instance.reload
+
+    tests('#authorize_ec2_group') do
+      @instance.authorize_ec2_group(ec2_group.name)
+      returns('authorizing') do
+        group = @instance.ec2_groups.detect do |g|
+          g['EC2SecurityGroupName'] == ec2_group.name
+        end
+        group['Status']
+      end
+      returns(false, 'not ready') { @instance.ready? }
+    end
+
+    @instance.wait_for { ready? }
+
+    tests('#revoke_ec2_group') do
+      @instance.revoke_ec2_group(ec2_group.name)
+      returns('revoking') do
+        group = @instance.ec2_groups.detect do |g|
+          g['EC2SecurityGroupName'] == ec2_group.name
+        end
+        group['Status']
+      end
+      returns(false, 'not ready') { @instance.ready? }
+    end
+
+    ec2_group.destroy
+  end
+
+  collection_tests(
+    AWS[:elasticache].security_groups,
+    {:id => group_name, :description => description}, false
+  )
+
+end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/elb/model_tests.rb

@@ -110,6 +110,8 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
     end
 
     server = Fog::Compute[:aws].servers.create
+    server.wait_for { ready? }
+
     tests('register instance') do
       begin
         elb.register_instances(server.id)

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/cloud_watch/list_metrics_test.rb

@@ -3,9 +3,9 @@ Shindo.tests('AWS::CloudWatch | metric requests', ['aws', 'cloudwatch']) do
   tests('success') do
     @metrics_list_format = {
       'ListMetricsResult' => {
-        'Metrics' => 
+        'Metrics' =>
           [{
-            'Dimensions' => 
+            'Dimensions' =>
             [{
               'Name' => String,
               'Value' => String
@@ -20,9 +20,9 @@ Shindo.tests('AWS::CloudWatch | metric requests', ['aws', 'cloudwatch']) do
     @instanceId = 'i-2f3eab59'
     @dimension_filtered_metrics_list_format = {
       'ListMetricsResult' => {
-        'Metrics' => 
+        'Metrics' =>
           [{
-            'Dimensions' => 
+            'Dimensions' =>
             [{
               'Name' => 'InstanceId',
               'Value' => @instanceId
@@ -61,4 +61,4 @@ Shindo.tests('AWS::CloudWatch | metric requests', ['aws', 'cloudwatch']) do
       end
     end
   end
-end
+end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/compute/image_tests.rb

@@ -31,6 +31,11 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
     'requestId'             => String
   }
 
+  @modify_image_attribute_format = {
+    'return'                => Fog::Boolean,
+    'requestId'             => String
+  }
+
   tests('success') do
     # the result for this is HUGE and relatively uninteresting...
     # tests("#describe_images").formats(@images_format) do
@@ -39,6 +44,8 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
     @image_id = 'ami-1aad5273'
 
     if Fog.mocking?
+      @other_account = Fog::Compute::AWS.new(:aws_access_key_id => 'other', :aws_secret_access_key => 'account')
+
       tests("#register_image").formats(@register_image_format) do
         @image = Fog::Compute[:aws].register_image('image', 'image', '/dev/sda1').body
       end
@@ -53,6 +60,26 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
       tests("#describe_images('state' => 'available')").formats(@describe_images_format) do
         Fog::Compute[:aws].describe_images('state' => 'available').body
       end
+
+      tests("other_account#describe_images('image-id' => '#{@image_id}')").returns([]) do
+        @other_account.describe_images('image-id' => @image_id).body['imagesSet']
+      end
+
+      tests("#modify_image_attribute('#{@image_id}', 'Add.UserId' => ['#{@other_account.data[:owner_id]}'])").formats(@modify_image_attribute_format) do
+        Fog::Compute[:aws].modify_image_attribute(@image_id, { 'Add.UserId' => [@other_account.data[:owner_id]] }).body
+      end
+
+      tests("other_account#describe_images('image-id' => '#{@image_id}')").returns([@image_id]) do
+        @other_account.describe_images('image-id' => @image_id).body['imagesSet'].map {|i| i['imageId'] }
+      end
+
+      tests("#modify_image_attribute('#{@image_id}', 'Remove.UserId' => ['#{@other_account.data[:owner_id]}'])").formats(@modify_image_attribute_format) do
+        Fog::Compute[:aws].modify_image_attribute(@image_id, { 'Remove.UserId' => [@other_account.data[:owner_id]] }).body
+      end
+
+      tests("other_account#describe_images('image-id' => '#{@image_id}')").returns([]) do
+        @other_account.describe_images('image-id' => @image_id).body['imagesSet']
+      end
     end
 
     tests("#describe_images('image-id' => '#{@image_id}')").formats(@describe_images_format) do
@@ -67,10 +94,14 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
   end
 
   tests('failure') do
-    pending if Fog.mocking?
-
     tests("#modify_image_attribute(nil, { 'Add.Group' => ['all'] })").raises(ArgumentError) do
       Fog::Compute[:aws].modify_image_attribute(nil, { 'Add.Group' => ['all'] }).body
     end
+
+    tests("#modify_image_attribute('ami-00000000', { 'Add.UserId' => ['123456789012'] })").raises(Fog::Compute::AWS::NotFound) do
+      pending unless Fog.mocking?
+
+      Fog::Compute[:aws].modify_image_attribute('ami-00000000', { 'Add.UserId' => ['123456789012'] }).body
+    end
   end
 end