cifrado 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a5a0c02f4d962d3ae89d56e154d44c16dab7348
-  data.tar.gz: 691d6fe9a5b52577dcb7050d90a82acea095423d
+  metadata.gz: f0746da846ed77bb7954fa0285936c7fcc391871
+  data.tar.gz: 646ed7ce8284059a364373c443d00957b415bd8d
 SHA512:
-  metadata.gz: dfe0187897d4e05c9af29dbffb9db76631e331872fdcf42a1f6df466ca63652e0406c3cadcad1f30e360be0ee620d8955cf55e953fc71d658e5cb674deb5e0d1
-  data.tar.gz: c8a0fbe0bc4c26734f99513c66256202235dd45a8bd3081e3ca7d1ac8100cc1071d81ce1ecf7c7f3455c219ab73f78c11087a777600206fc9d6f62daebc2ab4a
+  metadata.gz: 099631ccabe814128d9cdd920761d5f930ce454bb85c9e6b97903c0449f4cf40fde243ec2f25e2408314c2a646d6a2570e07f55d0ed4ac839fc8de8c9b79739e
+  data.tar.gz: 78b659ca0e2f3794f39f365bcfdfc2f24a0e4dd6902587bd9463ad4bb1bdaa8bdff0e3517db7094385648a5ab0e2c291ea64822a51786a5e79bbc22b2a53ec95

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# Cifrado 0.1.3 - Tue 05 Mar 2013
+
+* Fix regresion in the last release that may break regular OpenStack accounts
+* Added version command
+
 # Cifrado 0.1.2 - Mon 04 Mar 2013
 
 * Added Rackspace Cloud Files support

data/lib/cifrado/cli/version.rb

@@ -0,0 +1,8 @@
+module Cifrado
+  class CLI
+    desc 'version', 'Print Cifrado version'
+    def version
+      Log.info Cifrado::VERSION
+    end
+  end
+end

data/lib/cifrado/cli.rb

@@ -88,14 +88,19 @@ module Cifrado
         end
       end
 
-      if (config[:auth_url] !~ /rackspacecloud\.com/) and config[:tenant].nil?
-        Log.error "tenant not provided."
-        Log.error "Use --tenant option or run 'cifrado setup' first."
-        raise "Missing tenant"
-      else 
+      if config[:auth_url] =~ /rackspacecloud\.com/
+        Log.debug "Rackspace Authentication, removing tenant."
         # Make sure tenant is nil for Rackspace
         # otherwise we get a service catalog without cloudFiles endpoints
         config[:tenant] = nil
+      else 
+        if config[:tenant].nil?
+          Log.error "Tenant not provided."
+          Log.error "Use --tenant option or run 'cifrado setup' first."
+          raise "Missing tenant"
+        else
+          Log.debug "OpenStack regular authentication, using tenant name."
+        end
       end
 
       unless config[:secure_random]
@@ -119,6 +124,7 @@ require 'cifrado/cli/set_acl'
 require 'cifrado/cli/jukebox'
 require 'cifrado/cli/cinema'
 require 'cifrado/cli/saio'
+require 'cifrado/cli/version'
 
 at_exit do
   include Cifrado::Utils

data/lib/cifrado/version.rb

@@ -1,3 +1,3 @@
 module Cifrado
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/vendor/fog/lib/fog/openstack/storage.rb

@@ -57,6 +57,16 @@ module Fog
         def reset_data
           self.class.data.delete(@openstack_username)
         end
+        
+        def change_account(account)
+          @original_path ||= @path
+          version_string = @original_path.split('/')[1]
+          @path = "/#{version_string}/#{account}"
+        end
+
+        def reset_account_name
+          @path = @original_path
+        end
 
       end
 
@@ -86,6 +96,52 @@ module Fog
         def reload
           @connection.reset
         end
+        
+        # Change the current account while re-using the auth token.
+        #
+        # This is usefull when you have an admin role and you're able
+        # to HEAD other user accounts, set quotas, list files, etc.
+        #
+        # For example:
+        #
+        #     # List current user account details
+        #     service = Fog::Storage[:openstack]
+        #     service.request :method => 'HEAD'
+        #     
+        # Would return something like:
+        #
+        #     Account:                      AUTH_1234
+        #     Date:                         Tue, 05 Mar 2013 16:50:52 GMT
+        #     X-Account-Bytes-Used:         0 (0.00 Bytes)
+        #     X-Account-Container-Count:    0
+        #     X-Account-Object-Count:       0
+        #
+        # Now let's change the account
+        #
+        #     service.change_account('AUTH_3333')
+        #     service.request :method => 'HEAD'
+        # 
+        # Would return something like:
+        #     
+        #     Account:                      AUTH_3333
+        #     Date:                         Tue, 05 Mar 2013 16:51:53 GMT
+        #     X-Account-Bytes-Used:         23423433
+        #     X-Account-Container-Count:    2
+        #     X-Account-Object-Count:       10
+        #
+        # If we wan't to go back to our original admin account:
+        #
+        #     service.reset_account_name
+        # 
+        def change_account(account)
+          @original_path ||= @path 
+          version_string = @path.split('/')[1]
+          @path = "/#{version_string}/#{account}"
+        end
+
+        def reset_account_name
+          @path = @original_path
+        end
 
         def request(params, parse_json = true, &block)
           begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cifrado
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sergio Rubio
@@ -29,7 +29,7 @@ cert_chain:
   /Nnaz9wOXu6/VjBcnvFOGY8f32hVq619QiJVpV9zRgYa5M05mWRmwHByrb4yK0Ab
   3GpyuMMNBMk=
   -----END CERTIFICATE-----
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -197,6 +197,7 @@ files:
 - lib/cifrado/cli/setup.rb
 - lib/cifrado/cli/stat.rb
 - lib/cifrado/cli/upload.rb
+- lib/cifrado/cli/version.rb
 - lib/cifrado/config.rb
 - lib/cifrado/core_ext/ruby18_base64.rb
 - lib/cifrado/crypto_services.rb