iron_core 1.0.5 → 1.0.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDYwYzFhNTg0YmUzYzRmN2EzM2RhMGVkMDE4Yzg0NGVmNjE2ODk1OQ==
-  data.tar.gz: !binary |-
-    ODFhMmIzYmVjNjIwYTFhZmQ2ZDhjNmZkZGEzN2IwMDZhYmUzODE0ZA==
+SHA1:
+  metadata.gz: d4242d46932aaa5d4631b63ef7ca271d8b8e8e4d
+  data.tar.gz: b711a9caed69077007f64e94f89fa952e1d890d2
 SHA512:
-  metadata.gz: !binary |-
-    Y2Q4MzIxNjQ2MzZkODUyMjc0YzU4ZDM1N2MwNDIxZTkzZjA4YjIwOGFkYzQz
-    MTEzMjBjOGZlZWVmMDAzM2EzNjEzYjMyOGVlZGI5YjU2MTQ3NGY2MTZiYTU0
-    NDYxZTVkOTBhMzU2OTliMjA1ODVjODY0ZjY4NGU2ZmY2ZDVjMjg=
-  data.tar.gz: !binary |-
-    YzJmZWNjNTE4MDI2NDM0NGFiYjRkZDg4M2VjMGFlNDYxNzJlYjY1Y2NjMzBl
-    YWUwYTQ1MzI3N2YzNjdhMDc0YWNhYmM4Zjk1Njk5YmVlNTAwMTI1ODc1MjFk
-    NzhiZGVhYzI4MjFkOTJjMzUwNDZhMmQ5NDRmYmU2NDJhYTgwOWQ=
+  metadata.gz: e05d8fcf5d06d2371411478aee9f98d8d0cba40f80b6146b0835269f81f733a909e5d514a09bad2c11afcdf34df18ce8e54233018d38813dfef6229bdab2cb8b
+  data.tar.gz: 546cdfa1320532b6a33b261edac03043c7ba58415304733efd6f0363b72d46f7ea460a2bd1f641e885b275884b6819b70d936e1d32fb439975fca1b7134009b4

data/.gitignore

@@ -1,3 +1,4 @@
 .idea
 .bundle
 pkg
+*.gem

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    iron_core (1.0.0)
-      rest (>= 2.2.0)
+    iron_core (1.0.5)
+      rest (>= 3.0.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    mime-types (1.23)
-    minitest (5.0.6)
-    net-http-persistent (2.9)
-    rake (10.1.0)
-    rest (2.6.3)
-      net-http-persistent
-      rest-client (>= 0.3.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    test-unit (2.5.5)
+    minitest (5.5.1)
+    net-http-persistent (2.9.4)
+    netrc (0.10.3)
+    power_assert (0.2.2)
+    rake (10.4.2)
+    rest (3.0.3)
+      net-http-persistent (>= 2.9.1)
+      netrc
+    test-unit (3.0.9)
+      power_assert
 
 PLATFORMS
   ruby

data/iron_core.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
 
   gem.required_rubygems_version = ">= 1.3.6"
   gem.required_ruby_version = Gem::Requirement.new(">= 1.8")
-  gem.add_runtime_dependency "rest", ">= 2.6.4"
+  gem.add_runtime_dependency "rest", ">= 3.0.4"
 
   gem.add_development_dependency "test-unit"
   gem.add_development_dependency "minitest"

data/lib/iron_core.rb

@@ -1,3 +1,5 @@
 require 'iron_core/version'
 require 'iron_core/iron_logger'
 require 'iron_core/client'
+require 'iron_core/iron_token_provider'
+require 'iron_core/keystone_token_provider'

data/lib/iron_core/client.rb

@@ -8,9 +8,10 @@ module IronCore
   class Client
     attr_accessor :content_type
     attr_accessor :env
+    attr_reader :rest
 
     def initialize(company, product, options = {}, default_options = {}, extra_options_list = [])
-      @options_list = [:scheme, :host, :port, :user_agent, :http_gem] + extra_options_list
+      @options_list = [:scheme, :host, :port, :user_agent, :http_gem, :keystone, :http_proxy] + extra_options_list
 
       metaclass = class << self
         self
@@ -75,11 +76,35 @@ module IronCore
       default_http_gem = RUBY_VERSION.split('.')[1].to_i == 8 ? :rest_client : nil
       http_gem = @http_gem.nil? ? default_http_gem : @http_gem.to_sym
 
-      @rest = Rest::Client.new(:gem => http_gem)
+      rest_options = {:gem => http_gem}
+      rest_options[:http_proxy] = options[:http_proxy] if options[:http_proxy]
+      @rest = Rest::Client.new(rest_options)
+
+      if self.keystone && self.keystone.is_a?(Hash)
+        raise_keystone_config_error('server') if self.keystone[:server].nil?
+        raise_keystone_config_error('tenant') if self.keystone[:tenant].nil?
+        if self.keystone[:token].nil? && self.keystone[:tenant_token].nil? &&
+          (self.keystone[:username].nil? && self.keystone[:password].nil?)
+          raise_keystone_config_error('username, password or token')
+        end
+
+        @token_provider = IronCore::KeystoneTokenProvider.new(@rest, self.keystone)
+      else
+        @token_provider = IronCore::IronTokenProvider.new(@token)
+      end
     end
 
     def set_option(source, name, value)
       if send(name.to_s).nil? && (not value.nil?)
+        if value.class == Hash
+          value.keys.each do |key|
+            if key.class == String
+              value[key.to_sym] = value[key]
+              value.delete(key)
+            end
+          end
+        end
+
         IronCore::Logger.debug 'IronCore', "Setting #{name} to '#{value}' from #{source}"
 
         send(name.to_s + '=', value)
@@ -227,7 +252,7 @@ module IronCore
       IronCore::Logger.debug 'IronCore', "PUT #{base_url + method} with params='#{request_hash.to_s}'"
 
       begin
-      @rest.put(base_url + method, request_hash)
+        @rest.put(base_url + method, request_hash)
       rescue Rest::HttpError => ex
         extract_error_msg(ex)
       end
@@ -318,5 +343,10 @@ module IronCore
         IronCore::Logger.error 'IronCore', "Expecting #{length} symbol #{name} string", IronCore::Error
       end
     end
+
+    def raise_keystone_config_error(missing)
+      IronCore::Logger.error 'IronCore', "Keystone keys missing: #{missing}", IronCore::Error
+      raise IronCore::ConfigurationError.new("Keystone keys missing: #{missing}")
+    end
   end
 end

data/lib/iron_core/configuration_error.rb

@@ -0,0 +1,9 @@
+require 'iron_core/error'
+
+module IronCore
+  class ConfigurationError < IronCore::Error
+    def initialize(message)
+      super(message)
+    end
+  end
+end

data/lib/iron_core/iron_token_provider.rb

@@ -0,0 +1,11 @@
+module IronCore
+  class IronTokenProvider
+    def initialize(token)
+      @token = token
+    end
+
+    def token
+      @token
+    end
+  end
+end

data/lib/iron_core/keystone_token_provider.rb

@@ -0,0 +1,51 @@
+module IronCore
+  class KeystoneTokenProvider
+    def initialize(client, options)
+      @rest_client = client.dup
+      @token = options[:tenant_token] # Way to bypass fetching a token from keystone api
+      @server = options[:server]
+      @tenant = options[:tenant]
+      @username = options[:username]
+      @password = options[:password]
+      @user_token = options[:token]
+    end
+
+    def token
+      if @token.nil? || (@local_expires_at && (Time.now - @local_expires_at > -10))
+        payload = {
+          auth: {
+            tenantId: @tenant,
+          }
+        }
+        if @username.to_s != ''
+          payload[:auth][:passwordCredentials] = {
+            username: @username,
+            password: @password
+          }
+        elsif @user_token.to_s != ''
+          payload[:auth][:token] = {id: @user_token}
+        end
+
+        response = post(@server + 'tokens', payload)
+        result = JSON.parse(response.body)
+        token_data = result['access']['token']
+
+        issued_at = Time.parse(token_data['issued_at'] + " UTC")
+        expires = Time.parse(token_data['expires'] + " UTC")
+        duration = (expires - issued_at).to_i
+
+        @local_expires_at = Time.now + duration
+        @token = token_data['id']
+      end
+
+      @token
+    end
+
+    def post(path, params = {})
+      request_hash = {}
+      request_hash[:headers] = {'Content-Type' => 'application/json', 'Accept' => 'application/json'}
+      request_hash[:body] = params.to_json
+      @rest_client.post(path, request_hash)
+    end
+  end
+end

data/lib/iron_core/version.rb

@@ -1,5 +1,5 @@
 module IronCore
-  VERSION = "1.0.5"
+  VERSION = "1.0.7"
 
   def self.version
     VERSION

data/test/test_base.rb

@@ -0,0 +1,25 @@
+require 'test/unit'
+require 'yaml'
+begin
+  require File.join(File.dirname(__FILE__), '../lib/iron_core')
+rescue Exception => ex
+  puts "Could NOT load gem: " + ex.message
+  raise ex
+end
+
+class TestBase < Test::Unit::TestCase
+
+  def setup
+    puts 'setup'
+    @core = IronCore::Client.new("iron", "product", :gem => :net_http_persistent, :log_level=>Logger::DEBUG, 
+    :http_proxy=>"http://whatever"
+    )
+  end
+
+  def test_fake
+  end
+
+  ALL_OPS = [:get, :put, :post, :delete]
+
+
+end

data/test/tmp.rb

@@ -0,0 +1,17 @@
+require 'test/unit'
+require 'yaml'
+require_relative 'test_base'
+
+class TestTemp < TestBase
+  def setup
+    super
+
+  end
+
+
+  def test_post_file
+    
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_core
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.4
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.4
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Core library for Iron products
@@ -74,7 +74,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -83,10 +83,15 @@ files:
 - iron_core.gemspec
 - lib/iron_core.rb
 - lib/iron_core/client.rb
+- lib/iron_core/configuration_error.rb
 - lib/iron_core/error.rb
 - lib/iron_core/iron_logger.rb
+- lib/iron_core/iron_token_provider.rb
+- lib/iron_core/keystone_token_provider.rb
 - lib/iron_core/response_error.rb
 - lib/iron_core/version.rb
+- test/test_base.rb
+- test/tmp.rb
 homepage: https://github.com/iron-io/iron_core_ruby
 licenses: []
 metadata: {}
@@ -96,18 +101,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Core library for Iron products
-test_files: []
+test_files:
+- test/test_base.rb
+- test/tmp.rb