RubyGems - a9s_swift - Versions diffs - 0.1.4 → 0.2.0 - Mend

a9s_swift 0.1.4 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 159c003cd8be577850f303edba533d675aced635
-  data.tar.gz: 4606240725e7e0e9549eeea56f49e981b04b89b4
+  metadata.gz: 7a953008977d2f7da209bd6c2d4efb9b556880c9
+  data.tar.gz: 08295eb8f96eb724ac53a853a49a368a8b256707
 SHA512:
-  metadata.gz: a7c5759be960afd8ad5418449f1ee5eaf3f2b2884bf70df5ef3cd945dacd4f0b0ae1971d4309fcb6a05c65613eb9adce797ab53e0d8d41b2fcdc6d8945876e59
-  data.tar.gz: 44367b251e3e8fcca22922ff8358318e50fbf0904613d821597a62905849a565a86a7bc6f550eeb80c6c35e14e18ae2f0b53ff6ff67800705a4df289d13e3f77
+  metadata.gz: a876a6e47927483f0d20c22f07924a828d749d277cbb8685f7a3f1cc373f97ecb71de42eeae8cf628029e6fda4859ecb525c151ebed1a8122b4867abce5ef0f2
+  data.tar.gz: bf4cfd81d33a3b8e90af0381d673525195bcdfe7d1742690483b1845125978b7468d24e310d346c6ad2ca28f836cf7a1450ef0011a0c379ca79085d5859480f6

data/CHANGELOG.md ADDED Viewed

@@ -0,0 +1,3 @@
+# v0.2.0
+* adds support for the OpenStack fog provider

data/Gemfile.lock CHANGED Viewed

@@ -12,27 +12,33 @@ GEM
     builder (3.2.2)
     descendants_tracker (0.0.3)
     docile (1.1.3)
-    excon (0.32.1)
+    excon (0.39.5)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    fog (1.21.0)
+    fog (1.23.0)
       fog-brightbox
-      fog-core (~> 1.21, >= 1.21.1)
+      fog-core (~> 1.23)
       fog-json
+      fog-softlayer
+      ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.0.1)
-      fog-core
+    fog-brightbox (0.3.0)
+      fog-core (~> 1.22)
       fog-json
-    fog-core (1.21.1)
+      inflecto
+    fog-core (1.24.0)
       builder
-      excon (~> 0.32)
-      formatador (~> 0.2.0)
+      excon (~> 0.38)
+      formatador (~> 0.2)
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
     fog-json (1.0.0)
       multi_json (~> 1.0)
-    formatador (0.2.4)
+    fog-softlayer (0.3.15)
+      fog-core
+      fog-json
+    formatador (0.2.5)
     git (1.2.6)
     github_api (0.11.3)
       addressable (~> 2.3)
@@ -45,6 +51,8 @@ GEM
     hashie (2.0.5)
     highline (1.6.21)
     i18n (0.6.9)
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -57,17 +65,17 @@ GEM
     json (1.8.1)
     jwt (0.1.11)
       multi_json (>= 1.5)
-    mime-types (2.0)
-    mini_portile (0.5.3)
+    mime-types (2.3)
+    mini_portile (0.6.0)
     minitest (4.7.5)
-    multi_json (1.9.2)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    net-scp (1.1.2)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.8.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    net-ssh (2.9.1)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
     oauth2 (0.9.3)
       faraday (>= 0.8, < 0.10)
       jwt (~> 0.1.8)

data/Rakefile CHANGED Viewed

@@ -56,3 +56,4 @@ task :irb_console do
 end
 task irb: :irb_console
+task c: :irb_console

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.1.4
1	+ 0.2.0

data/a9s_swift.gemspec CHANGED Viewed

@@ -2,16 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: a9s_swift 0.1.4 ruby lib
 Gem::Specification.new do |s|
   s.name = "a9s_swift"
-  s.version = "0.1.4"
+  s.version = "0.2.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
   s.authors = ["Julian Weber"]
-  s.date = "2014-07-14"
+  s.date = "2014-08-28"
   s.description = "anynines.com swift service utility library for simplifying app acces to the a9s swift service."
   s.email = "jweber@anynines.com"
   s.extra_rdoc_files = [
@@ -20,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -36,7 +35,8 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/anynines/a9s_swift"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.0.6"
   s.summary = "anynines.com swift service utility library for simplifying app acces to the a9s swift service."
   if s.respond_to? :specification_version then

data/lib/a9s_swift/utility.rb CHANGED Viewed

@@ -6,26 +6,27 @@ class Anynines::Swift::Utility
   # Returns a fog storage connection to the swift service
   # @return [Fog::Storage] a fog storage connection
-  def self.fog_connection
-    Fog::Storage.new fog_credentials_hash
+  def self.fog_connection(provider = "hp")
+    Fog::Storage.new fog_credentials_hash(provider)
   end
   # Sets up paperclip for the usage with the anynines service.
   # Creates a bucket with the given name if not already present.
   # @param image_bucket_name [String] the bucket name to use
   # @param options [Hash] a hash of additional options
-  def self.configure_paperclip(image_bucket_name, options = {})
+  def self.configure_paperclip(image_bucket_name, options = {}, provider = "hp")
     raise "Paperclip wasn't found in your environment! Please verify that paperclip is included within your Gemfile and loaded correctly." if defined?(Paperclip).nil?
     opts = initialize_options options
-    create_new_bucket(image_bucket_name, opts[:fog_public])
+    create_new_bucket(image_bucket_name, opts[:fog_public], provider)
+    fog_hash = self.fog_credentials_hash(provider)
-    # configure paperclip to use the credentials provided by the anynines environment
+    # configure paperclip to use the credentials provided by the anynines environment
     Paperclip::Attachment.default_options.update(
       {
         :path => ":class/:id/:attachment/:style/img_:fingerprint",
         :storage => :fog,
-        :fog_credentials => self.fog_credentials_hash,
+        :fog_credentials => fog_hash,
         :fog_directory => image_bucket_name,
         :fog_public => opts[:fog_public],
         :fog_host => "#{SWIFT_HOST}/v1/AUTH_#{fog_hash[:hp_tenant_id]}/#{image_bucket_name}"
@@ -36,14 +37,15 @@ class Anynines::Swift::Utility
   # Creates a bucket with the given name if not already present.
   # @param image_bucket_name [String] the bucket name to use
   # @param options [Hash] a hash of additional options
-  def self.configure_carrierwave(image_bucket_name, options = {})
+  # @param provider [String] 'hp' or 'openstack'
+  def self.configure_carrierwave(image_bucket_name, options = {}, provider = "hp")
     raise "CarrierWave wasn't found in your environment! Please verify that carrierwave is included within your Gemfile and loaded correctly." if defined?(CarrierWave).nil?
     opts = initialize_options options
-    create_new_bucket(image_bucket_name, opts[:fog_public])
+    create_new_bucket(image_bucket_name, opts[:fog_public], provider)
     CarrierWave.configure do |config|
-      config.fog_credentials = fog_credentials_hash
+      config.fog_credentials = fog_credentials_hash(provider)
       config.storage = :fog
       config.fog_directory  = image_bucket_name
@@ -52,30 +54,30 @@ class Anynines::Swift::Utility
   end
   # Returns a fog compatible credentials hash for the swift service
-  def self.fog_credentials_hash
+  # @param provider [String] 'hp' or 'openstack'
+  def self.fog_credentials_hash(provider = "hp")
+    provider = provider.downcase
     # parse the VCAP_SERVICES environment variable
     services = JSON.parse(ENV["VCAP_SERVICES"])
     raise "Couldn't find the VCAP_SERVICE env variable! Are you running within an anynines environment?" if services.nil?
     raise "Couldn't access the a9s swift service credentials from env! Have you bound a swift service instance to the application?" if services["swift-1.0"].nil?
     swift_service = services["swift-1.0"].first
-    return {
-       :provider => 'HP',
-       :hp_access_key => swift_service["credentials"]["user_name"],
-       :hp_secret_key => swift_service["credentials"]["password"],
-       :hp_tenant_id => swift_service["credentials"]["tenant_id"],
-       :hp_auth_uri => swift_service["credentials"]["authentication_uri"],
-       :hp_use_upass_auth_style => true,
-       :hp_avl_zone => swift_service["credentials"]["availability_zone"],
-       :os_account_meta_temp_url_key => swift_service["credentials"]["account_meta_key"]
-    }
+    if provider == "hp"
+      fog_credentials_hash_hp_provider swift_service
+    elsif provider == "openstack"
+      fog_credentials_hash_openstack_provider swift_service
+    else
+      raise "No recognized provider. Please use 'hp' or 'openstack' as provider choice."
+    end
   end
   # Creates a new bucket with the given name if not already present
   # @param bucket_name [String] a name for the bucket
   # @param public_access [Boolean] should the bucket be publicly accessible?
-  def self.create_new_bucket(bucket_name, public_access)
-    connection = fog_connection
+  # @param provider [String] 'hp' or 'openstack'
+  def self.create_new_bucket(bucket_name, public_access, provider = "hp")
+    connection = fog_connection provider
     if connection.directories.get(bucket_name).nil?
       puts "The bucket with key=#{bucket_name} wasn't found. Creating bucket with key=#{bucket_name} ."
       bucket = connection.directories.create key: bucket_name
@@ -99,4 +101,38 @@ class Anynines::Swift::Utility
     options[:fog_public] = true if options[:fog_public].nil?
     return options
   end
+  def self.fog_credentials_hash_openstack_provider(vcap_service_subhash)
+    auth_uri = vcap_service_subhash["credentials"]["authentication_uri"]
+    last_route = auth_uri[auth_uri.length - 6, auth_uri.length - 1]
+    if last_route != "tokens"
+      last_char = auth_uri[auth_uri.length - 1]
+      if last_char == "/"
+        auth_uri = "#{auth_uri}tokens"
+      else
+        auth_uri = "#{auth_uri}/tokens"
+      end
+    end
+    {
+       :provider => 'OpenStack',
+       :openstack_auth_url => auth_uri,
+       :openstack_username => vcap_service_subhash["credentials"]["user_name"],
+       :openstack_api_key => vcap_service_subhash["credentials"]["password"],
+       :openstack_temp_url_key => vcap_service_subhash["credentials"]["account_meta_key"]
+    }
+  end
+  def self.fog_credentials_hash_hp_provider(vcap_service_subhash)
+    {
+       :provider => 'HP',
+       :hp_access_key => vcap_service_subhash["credentials"]["user_name"],
+       :hp_secret_key => vcap_service_subhash["credentials"]["password"],
+       :hp_tenant_id => vcap_service_subhash["credentials"]["tenant_id"],
+       :hp_auth_uri => vcap_service_subhash["credentials"]["authentication_uri"],
+       :hp_use_upass_auth_style => true,
+       :hp_avl_zone => vcap_service_subhash["credentials"]["availability_zone"],
+       :os_account_meta_temp_url_key => vcap_service_subhash["credentials"]["account_meta_key"]
+    }
+  end
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: a9s_swift
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Julian Weber
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -90,6 +90,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.0.6
 signing_key:
 specification_version: 4
 summary: anynines.com swift service utility library for simplifying app acces to the