lorj_cloud 0.1.4 → 0.1.5

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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/lorj_cloud/version.rb +2 -2
  3. data/lib/lorj_cloud.rb +1 -1
  4. data/lib/process/cloud/providers/hpcloud/hpcloud_query.rb +22 -5
  5. data/lorj_cloud.gemspec +2 -2
  6. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 117a39e2598d4263f58768a8511b41748bb1fdae
4
- data.tar.gz: 6d6b42bb3e7d2d4b68e5e7e0e23b2ae17e813a16
3
+ metadata.gz: 17e1978b46981170cb2e2395ccad5200e921eda6
4
+ data.tar.gz: a0dc7fbd515419b4ee1a7ac1869324352b67d044
5
5
  SHA512:
6
- metadata.gz: 2b8e84fca2d746bfcf44247ddf0254c05aa18b781bb097b0b3f854e38384f85655391766707d771b05b5802ee719dafe18b8d6dad480ee552ced2f3063e0aeb0
7
- data.tar.gz: 552715dbf1cd40919058b2572ea01f639fb91b5a220d6ce773caf891072745aa37e17cd4610319178e78b232a2c6bacfd9a4b8ddf40b6f61dbe9693d00e72d02
6
+ metadata.gz: 5f86a3b5662a3aa1828e8946e7c5ed85450a39854a97f83c1b485d26bc98568c05c440ebf6c75ed7ed81a4888dc8d6d92f4488228dccba92dd00eefddd5c6284
7
+ data.tar.gz: cac7a6ea085ab03798e9aa7223b496a72a48aeba442550ab3459a6ddebf3fb247effe3b02651201db8b4c429f1554b379ee8398fbd10193c20aad8f51c1e9064
data/lib/lorj_cloud/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # LorjCloud module
2
2
  module LorjCloud
3
- VERSION = '0.1.4'
4
- DATE = '2015-06-24'
3
+ VERSION = '0.1.5'
4
+ DATE = '2015-06-25'
5
5
  end
data/lib/lorj_cloud.rb CHANGED
@@ -3,4 +3,4 @@ require 'lorj_cloud/version'
3
3
  require 'lorj'
4
4
 
5
5
  Lorj.declare_process('cloud', File.dirname(__FILE__),
6
- :controllers_dir => 'providers')
6
+ :controllers_dir => 'providers', :lib_name => 'lorj_cloud')
data/lib/process/cloud/providers/hpcloud/hpcloud_query.rb CHANGED
@@ -33,18 +33,35 @@ class HpcloudController
33
33
  yield hParams, query if block_given?
34
34
 
35
35
  func = hParams[connection].send(property_name).method(:all)
36
+ objects = _compat_query(func, __method__, query)
37
+ # Uses :[] or :<key> to match object and query attr.
38
+ Lorj.debug(4, "'%s' gets %d records", __method__, objects.length)
39
+ ctrl_query_each objects, query # Return the select objects.
40
+ end
41
+ end
42
+
43
+ def _compat_query(func, cur_method, query)
44
+ # Ruby 1.9.2 introduce Method.parameters.
45
+ if RUBY_VERSION < '1.9.2'
46
+ Lorj.debug(4, "RUBY '%s': '%s' try Openstack API filter feature.",
47
+ RUBY_VERSION, cur_method)
48
+ begin
49
+ objects = func.call ctrl_query_select(query, String)
50
+ rescue
51
+ Lorj.debug(4, "RUBY '%s': '%s' No filter parameter.",
52
+ RUBY_VERSION, cur_method)
53
+ objects = func.call
54
+ end
55
+ else
36
56
  if func.parameters.length > 0
37
- Lorj.debug(4, "'%s' uses HPCloud API filter feature.", __method__)
57
+ Lorj.debug(4, "'%s' uses Openstack API filter feature.", cur_method)
38
58
  objects = func.call ctrl_query_select(query, String)
39
59
  else
40
60
  objects = func.call
41
61
  end
42
- # Uses :[] or :<key> to match object and query attr.
43
- Lorj.debug(4, "'%s' gets %d records", __method__, objects.length)
44
- ctrl_query_each objects, query # Return the select objects.
45
62
  end
63
+ objects
46
64
  end
47
-
48
65
  def_query :compute_connection, :tenant
49
66
 
50
67
  def_query :compute_connection, :image
data/lorj_cloud.gemspec CHANGED
@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
19
19
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
20
20
  spec.require_paths = ["lib"]
21
21
 
22
- spec.add_development_dependency "bundler", "~> 1.9"
22
+ spec.add_development_dependency "bundler", "~> 1.10"
23
23
  spec.add_development_dependency "rake", "~> 10.0"
24
24
  spec.add_development_dependency "rspec", "~> 3.1.0"
25
25
 
26
- spec.add_runtime_dependency "lorj", ">= 1.0.13"
26
+ spec.add_runtime_dependency "lorj", ">= 1.0.15"
27
27
  spec.add_runtime_dependency 'subhash', '>= 0.1.3'
28
28
  spec.add_runtime_dependency "fog", "~> 1.30.0"
29
29
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lorj_cloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christophe Larsonneur
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2015-06-24 00:00:00.000000000 Z
11
+ date: 2015-06-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '1.9'
19
+ version: '1.10'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '1.9'
26
+ version: '1.10'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - ">="
60
60
  - !ruby/object:Gem::Version
61
- version: 1.0.13
61
+ version: 1.0.15
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - ">="
67
67
  - !ruby/object:Gem::Version
68
- version: 1.0.13
68
+ version: 1.0.15
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: subhash
71
71
  requirement: !ruby/object:Gem::Requirement