cifrado 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8a5a0c02f4d962d3ae89d56e154d44c16dab7348
+  data.tar.gz: 691d6fe9a5b52577dcb7050d90a82acea095423d
+SHA512:
+  metadata.gz: dfe0187897d4e05c9af29dbffb9db76631e331872fdcf42a1f6df466ca63652e0406c3cadcad1f30e360be0ee620d8955cf55e953fc71d658e5cb674deb5e0d1
+  data.tar.gz: c8a0fbe0bc4c26734f99513c66256202235dd45a8bd3081e3ca7d1ac8100cc1071d81ce1ecf7c7f3455c219ab73f78c11087a777600206fc9d6f62daebc2ab4a

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+# Cifrado 0.1.2 - Mon 04 Mar 2013
+
+* Added Rackspace Cloud Files support
+  To use Rackspace Cloud Files, run 'setup' and provide the following
+  details when asked:
+  
+  username: <your Rackspace username>
+  password: <your Rackspace password> # NOT THE API KEY!
+  
+  For US accounts, the auth URL is:
+  
+  https://identity.api.rackspacecloud.com/v2.0/tokens
+  
+  For UK accounts:
+  
+  https://lon.identity.api.rackspacecloud.com/v2.0/tokens
+
+
 # Cifrado 0.1.1 - Sun 03 Mar 2013
 
 * saio command improvements

data/README.md

@@ -6,7 +6,13 @@ The current Cifrado release is experimental. Use at your own risk.
 
 OpenStack Swift CLI with built in (GPG) encryption.
 
-## Features available in Cifrado 0.1
+There's an **ongoing** effort to document Cifrado in the Wiki. Additional details such as
+documentation to bootstrap your own Swift All-In-One server with Cifrado and the demo
+server available are documented there.
+
+See [Cifrado Demo Server](https://github.com/rubiojr/cifrado/wiki/Cifrado-Demo-Server) and [Cifrado SAIO Bootstrap](https://github.com/rubiojr/cifrado/wiki/Cifrado-SAIO-bootstrap).
+
+## Features available in Cifrado 0.1.2
 
 * Uploading/downloading files and directories to/from OpenStack Swift.
 * Regular list/delete/stat commands to manipulate objects and containers.
@@ -23,6 +29,7 @@ OpenStack Swift CLI with built in (GPG) encryption.
 * Video streaming (streams video files available in a container).
 * Bootstrap a Swift All-In-One server in a cloud provider
   (DigitalOcean is the only one supported ATM).
+* Rackspace Cloud Files support (documentation available in the wiki).
 * Ruby 1.8.7, 1.9.X and 2.0 compatibility.
 
 Cifrado has a built-in help command:
@@ -68,7 +75,7 @@ To add the PPA and install the packages, open a terminal and type:
 ```
 sudo add-apt-repository ppa:rubiojr/cifrado
 sudo apt-get update
-sudo apt-get install cifrado
+sudo apt-get install cifrado mplayer --no-install-recommends
 ```
 
 You'll also need GnuPG and MPlayer installed if you want to have
@@ -178,6 +185,28 @@ test container, download it like any other regular object.
 
 #### Downloading files
 
+Downloading a file
+
+```
+$ cifrado download my-container my-object
+```
+
+Will download my-object from my-container to the current directory.
+If you want to download the file to another directory:
+
+```
+$ cifrado download my-container my-object --output /tmp
+```
+
+You can also download all the files available in a container:
+
+```
+$cifrado download my-container --output /tmp/mycontainer
+```
+
+This will download all the files in 'my-container' container
+to /tmp/mycontainer.
+
 #### Encryption support
 
 **Symmetric Encryption**

data/TODO.md

@@ -1,6 +1,8 @@
 * Cifrado::CLI needs heavy refactoring
-* Graceful exits (i.e. when hitting Ctrl-C)
 * Uploads with progressbar are very inefficient under ruby 1.8 
   (1.9 is slightly better)
 * High CPU utilisation when uplading at high speed
-* Implement 'swift style' segmented uploads
+* Object/Container copy: https://answers.launchpad.net/swift/+question/154210
+* Additional providers for cifrado saio (OpenStack, Rackspace)
+* Rackspace, Dreamhost Objects, HP support
+* Plugin API, pluggin support

data/lib/cifrado/cli.rb

@@ -80,13 +80,24 @@ module Cifrado
       config[:tenant]          = options[:tenant]   || config[:tenant] 
       config[:region]          = options[:region]   || config[:region] 
       config[:secure_random]   = config[:secure_random]
-      [:username, :password, :auth_url, :tenant].each do |opt|
+      [:username, :password, :auth_url].each do |opt|
         if config[opt].nil?
           Log.error "#{opt.to_s.capitalize} not provided."
           Log.error "Use --#{opt.to_s.gsub('_', '-')} option or run 'cifrado setup' first."
           raise "Missing setting"
         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 
+        # Make sure tenant is nil for Rackspace
+        # otherwise we get a service catalog without cloudFiles endpoints
+        config[:tenant] = nil
+      end
+
       unless config[:secure_random]
         raise Exception.new("secure_random key not found in #{config_file}")
       end

data/lib/cifrado/cli/setup.rb

@@ -27,12 +27,14 @@ module Cifrado
       puts "The settings (password included) are saved unencrypted."
       puts
       config[:username] = ask(set_color('Username:', :bold))
-      config[:tenant]   = ask(set_color('Tenant:', :bold))
       system 'stty -echo'
       config[:password] = ask(set_color 'Password:', :bold)
       system 'stty echo'
       puts
       config[:auth_url] = ask(set_color 'Auth URL:', :bold)
+      if config[:auth_url] !~ /rackspacecloud\.com/
+        config[:tenant]   = ask(set_color('Tenant:', :bold))
+      end
 
       if !config[:secure_random]
         # shit happens

data/lib/cifrado/streaming_uploader.rb

@@ -1,19 +1,5 @@
 module Cifrado 
 
-  # StreamingUploader Adapted by Sergio Rubio <rubiojr@frameos.org>
-  #
-  # inspired by Opscode Chef StreamingCookbookUploader chef/streaming_cookbook_uploader.rb
-  # http://opscode.com
-  # 
-  # inspired by/cargo-culted from http://stanislavvitvitskiy.blogspot.com/2008/12/multipart-post-in-ruby.html
-  # On Apr 6, 2010, at 3:00 PM, Stanislav Vitvitskiy wrote:
-  #
-  # It's free to use / modify / distribute. No need to mention anything. Just copy/paste and use.
-  #
-  # Regards,
-  # Stan
-
-
   require 'net/http'
   require 'net/https'
   require 'cifrado/rate_limit'

data/lib/cifrado/version.rb

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

data/tests/cli/upload_multi_tests.rb

@@ -9,7 +9,7 @@ Shindo.tests('Cifrado | CLI#upload') do
     :insecure => true,
     :no_progressbar => true
   }
-  cli_options.merge!(cfg[:cli_options]) if cfg
+  cli_options.merge!(cfg[:cli_options]) if cfg[:cli_options]
   cli = Cifrado::CLI.new
   cli.options = cli_options
 

data/tests/cli/upload_tests.rb

@@ -9,7 +9,7 @@ Shindo.tests('Cifrado | CLI#upload') do
     :insecure => true,
     :no_progressbar => true
   }
-  cli_options.merge!(cfg[:cli_options]) if cfg
+  cli_options.merge!(cfg[:cli_options]) if cfg[:cli_options]
 
   tests '#upload' do
     tests 'segmented uploads' do

metadata

@@ -1,186 +1,160 @@
 --- !ruby/object:Gem::Specification
 name: cifrado
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Sergio Rubio
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURORENDQWh5Z0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREJBTVJBd0RnWURWUVFEREFkeWRX
-  SnAKYjJweU1SY3dGUVlLQ1pJbWlaUHlMR1FCR1JZSFpuSmhiV1Z2Y3pFVE1C
-  RUdDZ21TSm9tVDhpeGtBUmtXQTI5eQpaekFlRncweE16QXlNVEl5TURVME5U
-  RmFGdzB4TkRBeU1USXlNRFUwTlRGYU1FQXhFREFPQmdOVkJBTU1CM0oxCllt
-  bHZhbkl4RnpBVkJnb0praWFKay9Jc1pBRVpGZ2RtY21GdFpXOXpNUk13RVFZ
-  S0NaSW1pWlB5TEdRQkdSWUQKYjNKbk1JSUJJakFOQmdrcWhraUc5dzBCQVFF
-  RkFBT0NBUThBTUlJQkNnS0NBUUVBNmdTc0lpYjNISFE4N0RzdQo5RVp6S01r
-  Mm9zd2dsemF0bXhJYkNLWFRDZmxURmQ3VTRJM3NpbkdDT1Bka1JtcWY5dmpK
-  U3YycHBGbnE4RC9KCmZsVXJxcHZxbkRTR1dXNG1IZENYR0drYmdzbU5HVjJk
-  M0FZR0MxZmhzdEJUeEpJdlFhRGlieHJINUlJcUJ0Tk4Kd0JHck9WdVNiMUhq
-  cVBwcCs1TUtjUWRxWVQ0R1cxclprZVY0RllYZytTVGh3angrQWxtdlVLbU1U
-  OWNtQjJNbApKV3BJZDRPMDI3QWpjZG1PazFzMVpNSWxyK1p6VjBFRG1xUHlO
-  Rm14Wm03MlFVc3l3aWpNOUI3NmVWQzVzZE9ICkpLWks3NW9YdHowUHIrK01Z
-  VGxOYVhIdTk4UnpnTXlPekxITTVMUkNaZzFmL3pCOU5iSTJGcW03SUlmS3B6
-  MGUKOUtHQkZRSURBUUFCb3prd056QUpCZ05WSFJNRUFqQUFNQjBHQTFVZERn
-  UVdCQlNPNDhKWkVFOXl2STEzUWZIMgpVVkVXdDQ1UWFUQUxCZ05WSFE4RUJB
-  TUNCTEF3RFFZSktvWklodmNOQVFFRkJRQURnZ0VCQUJUcTdzQ2xuWjgzClpl
-  R2dPVUtNWXE3L0k1Z0dnWkh5akljdWNlTXVWbGhWV2NqcnhDMUZuN2VxQ1p1
-  cEFmdmVveGlOcldST21aM0MKMjYrblNsd01WUXViOXJ1b0d3ZWpTMVBTRUJy
-  dFI1NnNaNzhXTndVTW9nanpQVXpERGdIWmdETW5lS0x5dFNjbwp1c3RKU1BQ
-  OHdqeG9WKzU5SnVJRlk4b3FGeTNCMG85YjdXVTU5Uk53cWRhdWFXeWUxSkVX
-  cjVjMThkTThWSktDCjlnTk5OaXdyaDFRNVEzSHdqamVObFVqR1ptUWNnY2VH
-  NFhkb294ODkvSE5tNWJ5ODNtSGtuRCsrdHF3YTJuOEYKL05uYXo5d09YdTYv
-  VmpCY252Rk9HWThmMzJoVnE2MTlRaUpWcFY5elJnWWE1TTA1bVdSbXdIQnly
-  YjR5SzBBYgozR3B5dU1NTkJNaz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0t
-  LQo=
-date: 2013-03-03 00:00:00.000000000 Z
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDNDCCAhygAwIBAgIBADANBgkqhkiG9w0BAQUFADBAMRAwDgYDVQQDDAdydWJp
+  b2pyMRcwFQYKCZImiZPyLGQBGRYHZnJhbWVvczETMBEGCgmSJomT8ixkARkWA29y
+  ZzAeFw0xMzAyMTIyMDU0NTFaFw0xNDAyMTIyMDU0NTFaMEAxEDAOBgNVBAMMB3J1
+  YmlvanIxFzAVBgoJkiaJk/IsZAEZFgdmcmFtZW9zMRMwEQYKCZImiZPyLGQBGRYD
+  b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6gSsIib3HHQ87Dsu
+  9EZzKMk2oswglzatmxIbCKXTCflTFd7U4I3sinGCOPdkRmqf9vjJSv2ppFnq8D/J
+  flUrqpvqnDSGWW4mHdCXGGkbgsmNGV2d3AYGC1fhstBTxJIvQaDibxrH5IIqBtNN
+  wBGrOVuSb1HjqPpp+5MKcQdqYT4GW1rZkeV4FYXg+SThwjx+AlmvUKmMT9cmB2Ml
+  JWpId4O027AjcdmOk1s1ZMIlr+ZzV0EDmqPyNFmxZm72QUsywijM9B76eVC5sdOH
+  JKZK75oXtz0Pr++MYTlNaXHu98RzgMyOzLHM5LRCZg1f/zB9NbI2Fqm7IIfKpz0e
+  9KGBFQIDAQABozkwNzAJBgNVHRMEAjAAMB0GA1UdDgQWBBSO48JZEE9yvI13QfH2
+  UVEWt45QaTALBgNVHQ8EBAMCBLAwDQYJKoZIhvcNAQEFBQADggEBABTq7sClnZ83
+  ZeGgOUKMYq7/I5gGgZHyjIcuceMuVlhVWcjrxC1Fn7eqCZupAfveoxiNrWROmZ3C
+  26+nSlwMVQub9ruoGwejS1PSEBrtR56sZ78WNwUMogjzPUzDDgHZgDMneKLytSco
+  ustJSPP8wjxoV+59JuIFY8oqFy3B0o9b7WU59RNwqdauaWye1JEWr5c18dM8VJKC
+  9gNNNiwrh1Q5Q3HwjjeNlUjGZmQcgceG4Xdoox89/HNm5by83mHknD++tqwa2n8F
+  /Nnaz9wOXu6/VjBcnvFOGY8f32hVq619QiJVpV9zRgYa5M05mWRmwHByrb4yK0Ab
+  3GpyuMMNBMk=
+  -----END CERTIFICATE-----
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
   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: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.17'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   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: multi_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: mime-types
   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: yajl-ruby
   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: formatador
   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: shexy
   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: shindo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: OpenStack Swift CLI with encryption support
@@ -558,26 +532,26 @@ files:
 - vendor/fog/lib/fog/volume.rb
 homepage: http://rubiojr.github.com/cifrado
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OpenStack Swift CLI with encryption support
 test_files: []
+has_rdoc: