fog 0.0.66 → 0.0.67

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 66
+:patch: 67
 :build: 

data/bin/fog

@@ -4,6 +4,7 @@ require File.join(lib_dir, 'fog')
 require 'irb'
 require 'yaml'
 
+require File.join(lib_dir, 'fog', 'credentials')
 require File.join(lib_dir, 'fog', 'bin')
 
 Fog.credential = (ARGV.first && :"#{ARGV.first}") || :default

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.66"
+  s.version = "0.0.67"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-04-01}
+  s.date = %q{2010-04-02}
   s.default_executable = %q{fog}
   s.description = %q{The Ruby cloud computing library.}
   s.email = %q{geemus@gmail.com}
@@ -138,6 +138,7 @@ Gem::Specification.new do |s|
     "lib/fog/bin.rb",
     "lib/fog/collection.rb",
     "lib/fog/connection.rb",
+    "lib/fog/credentials.rb",
     "lib/fog/model.rb",
     "lib/fog/parser.rb",
     "lib/fog/rackspace.rb",

data/lib/fog/aws/models/s3/files.rb

@@ -10,7 +10,7 @@ module Fog
         attribute :delimiter,     'Delimiter'
         attribute :is_truncated,  'IsTruncated'
         attribute :marker,        'Marker'
-        attribute :max_keys,      'MaxKeys'
+        attribute :max_keys,      ['MaxKeys', 'max-keys']
         attribute :prefix,        'Prefix'
 
         model Fog::AWS::S3::File

data/lib/fog/bin.rb

@@ -1,46 +1,6 @@
 module Fog
   class << self
 
-    def credential=(new_credential)
-      @credential = new_credential
-      @credentials = nil
-    end
-
-    def credential
-      @credential || :default
-    end
-
-    def credentials
-      @credentials ||= begin
-        path = File.expand_path('~/.fog')
-        credentials = if File.exists?(path)
-          File.open(path) do |file|
-            YAML.load(file.read)
-          end
-        else
-          nil
-        end
-        unless credentials && credentials[credential]
-          print("\n  To run as '#{credential}', add the following to ~/.fog\n")
-          yml = <<-YML
-
-:#{credential}:
-  :aws_access_key_id:     INTENTIONALLY_LEFT_BLANK
-  :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
-  :rackspace_api_key:     INTENTIONALLY_LEFT_BLANK
-  :rackspace_username:    INTENTIONALLY_LEFT_BLANK
-  :slicehost_password:    INTENTIONALLY_LEFT_BLANK
-  :terremark_username:    INTENTIONALLY_LEFT_BLANK
-  :terremark_password:    INTENTIONALLY_LEFT_BLANK
-
-YML
-          print(yml)
-          raise(ArgumentError.new("Missing Credentials"))
-        end
-        credentials[credential]
-      end
-    end
-
     def services
       services = []
       [::AWS, ::Rackspace, ::Slicehost, ::Terremark].each do |service|

data/lib/fog/credentials.rb

@@ -0,0 +1,45 @@
+module Fog
+  class << self
+
+    def credential=(new_credential)
+      @credential = new_credential
+      @credentials = nil
+    end
+
+    def credential
+      @credential || :default
+    end
+
+    def credentials
+      @credentials ||= begin
+        path = File.expand_path('~/.fog')
+        credentials = if File.exists?(path)
+          File.open(path) do |file|
+            YAML.load(file.read)
+          end
+        else
+          nil
+        end
+        unless credentials && credentials[credential]
+          print("\n  To run as '#{credential}', add the following to ~/.fog\n")
+          yml = <<-YML
+
+:#{credential}:
+  :aws_access_key_id:     INTENTIONALLY_LEFT_BLANK
+  :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
+  :rackspace_api_key:     INTENTIONALLY_LEFT_BLANK
+  :rackspace_username:    INTENTIONALLY_LEFT_BLANK
+  :slicehost_password:    INTENTIONALLY_LEFT_BLANK
+  :terremark_username:    INTENTIONALLY_LEFT_BLANK
+  :terremark_password:    INTENTIONALLY_LEFT_BLANK
+
+YML
+          print(yml)
+          raise(ArgumentError.new("Missing Credentials"))
+        end
+        credentials[credential]
+      end
+    end
+
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 66
-  version: 0.0.66
+  - 67
+  version: 0.0.67
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -07:00
+date: 2010-04-02 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -222,6 +222,7 @@ files:
 - lib/fog/bin.rb
 - lib/fog/collection.rb
 - lib/fog/connection.rb
+- lib/fog/credentials.rb
 - lib/fog/model.rb
 - lib/fog/parser.rb
 - lib/fog/rackspace.rb