amazon-pricing 0.1.24 → 0.1.25

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. data/{CHANGELOG → CHANGELOG.md} +15 -6
  2. data/Gemfile.lock +2 -1
  3. data/lib/amazon-pricing.rb +10 -2
  4. data/lib/amazon-pricing/version.rb +1 -1
  5. metadata +27 -25
  6. checksums.yaml +0 -15
data/{CHANGELOG → CHANGELOG.md} RENAMED
@@ -1,20 +1,29 @@
1
- = Version 0.1.21
1
+ ### Version 0.1.25
2
+
3
+ * Handle JSON::ParserError for RDS json doc (@lardcanoe)
4
+
5
+ ### Version 0.1.21
6
+
2
7
  * Fix postgresql reference (@lardcanoe)
3
8
 
4
- = Version 0.1.7
9
+ ### Version 0.1.7
10
+
5
11
  * Refactored model to simplify access (one instance type for all usages),
6
12
  introduced operating system pricing to suppport RHEL, SLES, etc...
7
13
 
8
- = Version 0.0.6
14
+ ### Version 0.0.6
15
+
9
16
  * Another missing instance type, cc2.8xlarge
10
17
 
11
- = Version 0.0.5
18
+ ### Version 0.0.5
19
+
12
20
  * Added conventional region name lookup
13
21
 
14
- = Version 0.0.4
22
+ ### Version 0.0.4
23
+
15
24
  * Added missing instance types
16
25
 
17
- = Version 0.0.1
26
+ ### Version 0.0.1
18
27
 
19
28
  * Created basic framework for dynamically retrieving pricing information
20
29
  on EC2 on-demand and reserved instances.
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- amazon-pricing (0.1.22)
4
+ amazon-pricing (0.1.25)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
@@ -19,6 +19,7 @@ GEM
19
19
  test-unit (2.5.5)
20
20
 
21
21
  PLATFORMS
22
+ java
22
23
  ruby
23
24
 
24
25
  DEPENDENCIES
data/lib/amazon-pricing.rb CHANGED
@@ -43,10 +43,18 @@ module AwsPricing
43
43
  if body.split("\n").last == ";"
44
44
  # Now remove one more line (rds is returning ";", ec2 empty line)
45
45
  body = body.reverse.sub(";", "").reverse
46
+ elsif body[-1] == ";"
47
+ body.chop!
46
48
  end
47
49
 
48
- #body = page.body.split("\n")[1..-2].join("\n")
49
- JSON.parse(body)
50
+ begin
51
+ JSON.parse(body)
52
+ rescue JSON::ParserError
53
+ # Handle "json" with keys that are not quoted
54
+ # When we get {foo: "1"} instead of {"foo": "1"}
55
+ # http://stackoverflow.com/questions/2060356/parsing-json-without-quoted-keys
56
+ JSON.parse(body.gsub(/(\w+)\s*:/, '"\1":'))
57
+ end
50
58
  end
51
59
 
52
60
  protected
data/lib/amazon-pricing/version.rb CHANGED
@@ -8,5 +8,5 @@
8
8
  # Home:: http://github.com/CloudHealth/amazon-pricing
9
9
  #++
10
10
  module AwsPricing
11
- VERSION = '0.1.24'
11
+ VERSION = '0.1.25'
12
12
  end
metadata CHANGED
@@ -1,14 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: amazon-pricing
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.24
4
+ version: 0.1.25
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Joe Kinsella
8
- autorequire:
9
+ autorequire:
9
10
  bindir: bin
10
11
  cert_chain: []
11
- date: 2014-03-18 00:00:00.000000000 Z
12
+ date: 2014-03-26 00:00:00.000000000 Z
12
13
  dependencies: []
13
14
  description: A Ruby library for retrieving pricing for Amazon Web Services
14
15
  email:
@@ -19,7 +20,7 @@ extra_rdoc_files:
19
20
  - LICENSE
20
21
  - README.md
21
22
  files:
22
- - CHANGELOG
23
+ - CHANGELOG.md
23
24
  - Gemfile
24
25
  - Gemfile.lock
25
26
  - LICENSE
@@ -46,38 +47,39 @@ files:
46
47
  homepage: http://github.com/CloudHealth/amazon-pricing
47
48
  licenses:
48
49
  - MIT
49
- metadata: {}
50
- post_install_message:
50
+ post_install_message:
51
51
  rdoc_options:
52
- - --title
52
+ - "--title"
53
53
  - amazon-pricing documentation
54
- - --line-numbers
55
- - --main
54
+ - "--line-numbers"
55
+ - "--main"
56
56
  - README.md
57
57
  require_paths:
58
58
  - lib
59
59
  required_ruby_version: !ruby/object:Gem::Requirement
60
60
  requirements:
61
- - - ! '>='
61
+ - - ">="
62
62
  - !ruby/object:Gem::Version
63
- version: '0'
63
+ segments:
64
+ - 0
65
+ version: !binary |-
66
+ MA==
67
+ hash: 2
68
+ none: false
64
69
  required_rubygems_version: !ruby/object:Gem::Requirement
65
70
  requirements:
66
- - - ! '>='
71
+ - - ">="
67
72
  - !ruby/object:Gem::Version
68
- version: '0'
73
+ segments:
74
+ - 0
75
+ version: !binary |-
76
+ MA==
77
+ hash: 2
78
+ none: false
69
79
  requirements: []
70
80
  rubyforge_project: amazon-pricing
71
- rubygems_version: 2.2.2
72
- signing_key:
73
- specification_version: 4
81
+ rubygems_version: 1.8.24
82
+ signing_key:
83
+ specification_version: 3
74
84
  summary: Amazon Web Services Pricing Ruby gem
75
- test_files:
76
- - spec/instance_type_spec.rb
77
- - spec/price_list_spec.rb
78
- - spec/rds_pricing_spec.rb
79
- - spec/spec_helper.rb
80
- - spec/support/.gitignore
81
- - test/ec2_instance_types_test.rb
82
- - test/helper.rb
83
- has_rdoc:
85
+ test_files: []
checksums.yaml DELETED
@@ -1,15 +0,0 @@
1
- ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NTZlOTJmYmE3NDE5MGZkN2I4Yzg1N2M1MTBmZjhiZmMwNmFjOTBjNQ==
5
- data.tar.gz: !binary |-
6
- OThkNzhjOWRjOTQ4YjRhNDU2MmZiNzI4YjBiNzY2NDYwMWFmYTViZA==
7
- SHA512:
8
- metadata.gz: !binary |-
9
- MzBkMWI3ZjY0NWNkMmM3ZmJiNTc2NzI0ZTk1MmNmZjg0YmViMDhiNjVjYWZj
10
- ZTkxMDI3MDA2Y2Q2YjVlMGE4N2QxYjZkYTVmYmFkMGY1ODBkODYwNWRmZjky
11
- NDA2OTY2NDZlNTkxZGU5YmQ1ODJiNTE5MTM1MDA5ZGFjNzIxYjA=
12
- data.tar.gz: !binary |-
13
- NWZkYTk1MDg0NDEwMGZmNzYxNzFkODFlOWJhOWRiYjZhODE2NDA0N2ZlNWY5
14
- OGU2ZTFlNGNiZTIyYTA4MTliNDg3NTAzZGM5ZmFkYmQ4YWNiODdiNTA0OWE1
15
- N2Q1ZjI4MTU0NDlkZmQwYTc2ODBlMzA4ZTNkNmRmYjAwNWZmNTQ=