reyes 1.2.3 → 1.2.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 61f01a35645369440547b1f18ab9e54198517333
4
+ data.tar.gz: 0d7c52cabb36d1ef701a25675ba90b59dbf8bdd5
5
+ SHA512:
6
+ metadata.gz: 1313dc3e0fb2409af321068d736147a979e9e6cfe34e637c7b2b330cc67f3a5324fe5eacbc2d44a8c9565ffab96f4332e9b307dc579778c19ea64c190d568dee
7
+ data.tar.gz: 8bc4378ef1719eeb5d48fc571255bb7364d5c15b2f89a588d2bae33bf411dcf50f41d9bfa02e749280f7d8174d1d1dfaa44877798466af68f73baa20b39b5ab8
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 1.9.3
1
+ 2.1
data/bin/reyes CHANGED
@@ -64,7 +64,8 @@ def command_upload(options)
64
64
  s3 = Reyes::S3Loader.new(aws, options[:config])
65
65
 
66
66
  if options[:archive]
67
- archive_name = "#{Socket.gethostname}-#{Time.now.to_i}"
67
+ timestamp = data.fetch('metadata').fetch('generated_stamp')
68
+ archive_name = "#{Socket.gethostname}/#{timestamp}"
68
69
  s3.archive_rules(armoured_data, archive_name)
69
70
  end
70
71
 
data/config.yaml.example CHANGED
@@ -23,6 +23,10 @@ aws:
23
23
  - reyes
24
24
  - qa-reyes
25
25
 
26
+ class_options:
27
+ AWS::EC2:
28
+ :max_retries: 4
29
+
26
30
  reyes:
27
31
  pgp:
28
32
  signing_key: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -364,6 +364,10 @@ module Reyes
364
364
  @config.aws_config
365
365
  end
366
366
 
367
+ def aws_config_class_options(klass)
368
+ aws_config.fetch('class_options', {}).fetch(klass.name, {})
369
+ end
370
+
367
371
  def connect!
368
372
  conns = {
369
373
  ec2: {},
@@ -389,6 +393,8 @@ module Reyes
389
393
  rescue KeyError
390
394
  end
391
395
 
396
+ opts = aws_config_class_options(klass).merge(opts)
397
+
392
398
  klass.new(opts)
393
399
  end
394
400
  end
data/lib/reyes/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Reyes
2
2
  # The Reyes version number
3
- VERSION = '1.2.3' unless defined?(self::VERSION)
3
+ VERSION = '1.2.4' unless defined?(self::VERSION)
4
4
 
5
5
  # Number defining the JSON serialization format
6
6
  JSON_FORMAT_VERSION = 2 unless defined?(self::JSON_FORMAT_VERSION)
metadata CHANGED
@@ -1,8 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: reyes
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.3
5
- prerelease:
4
+ version: 1.2.4
6
5
  platform: ruby
7
6
  authors:
8
7
  - Andy Brody
@@ -10,105 +9,96 @@ authors:
10
9
  autorequire:
11
10
  bindir: bin
12
11
  cert_chain: []
13
- date: 2015-05-29 00:00:00.000000000 Z
12
+ date: 2015-07-23 00:00:00.000000000 Z
14
13
  dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: aws-sdk
17
16
  requirement: !ruby/object:Gem::Requirement
18
- none: false
19
17
  requirements:
20
- - - ~>
18
+ - - "~>"
21
19
  - !ruby/object:Gem::Version
22
20
  version: '1.60'
23
21
  type: :runtime
24
22
  prerelease: false
25
23
  version_requirements: !ruby/object:Gem::Requirement
26
- none: false
27
24
  requirements:
28
- - - ~>
25
+ - - "~>"
29
26
  - !ruby/object:Gem::Version
30
27
  version: '1.60'
31
28
  - !ruby/object:Gem::Dependency
32
29
  name: chalk-log
33
30
  requirement: !ruby/object:Gem::Requirement
34
- none: false
35
31
  requirements:
36
- - - ~>
32
+ - - "~>"
37
33
  - !ruby/object:Gem::Version
38
34
  version: '0.1'
39
35
  type: :runtime
40
36
  prerelease: false
41
37
  version_requirements: !ruby/object:Gem::Requirement
42
- none: false
43
38
  requirements:
44
- - - ~>
39
+ - - "~>"
45
40
  - !ruby/object:Gem::Version
46
41
  version: '0.1'
47
42
  - !ruby/object:Gem::Dependency
48
43
  name: subprocess
49
44
  requirement: !ruby/object:Gem::Requirement
50
- none: false
51
45
  requirements:
52
- - - ~>
46
+ - - "~>"
53
47
  - !ruby/object:Gem::Version
54
48
  version: '1.2'
55
49
  type: :runtime
56
50
  prerelease: false
57
51
  version_requirements: !ruby/object:Gem::Requirement
58
- none: false
59
52
  requirements:
60
- - - ~>
53
+ - - "~>"
61
54
  - !ruby/object:Gem::Version
62
55
  version: '1.2'
63
56
  - !ruby/object:Gem::Dependency
64
57
  name: pry
65
58
  requirement: !ruby/object:Gem::Requirement
66
- none: false
67
59
  requirements:
68
- - - ! '>='
60
+ - - ">="
69
61
  - !ruby/object:Gem::Version
70
62
  version: '0'
71
63
  type: :development
72
64
  prerelease: false
73
65
  version_requirements: !ruby/object:Gem::Requirement
74
- none: false
75
66
  requirements:
76
- - - ! '>='
67
+ - - ">="
77
68
  - !ruby/object:Gem::Version
78
69
  version: '0'
79
70
  - !ruby/object:Gem::Dependency
80
71
  name: rake
81
72
  requirement: !ruby/object:Gem::Requirement
82
- none: false
83
73
  requirements:
84
- - - ! '>='
74
+ - - ">="
85
75
  - !ruby/object:Gem::Version
86
76
  version: '0'
87
77
  type: :development
88
78
  prerelease: false
89
79
  version_requirements: !ruby/object:Gem::Requirement
90
- none: false
91
80
  requirements:
92
- - - ! '>='
81
+ - - ">="
93
82
  - !ruby/object:Gem::Version
94
83
  version: '0'
95
84
  - !ruby/object:Gem::Dependency
96
85
  name: rubocop
97
86
  requirement: !ruby/object:Gem::Requirement
98
- none: false
99
87
  requirements:
100
- - - ! '>='
88
+ - - ">="
101
89
  - !ruby/object:Gem::Version
102
90
  version: '0'
103
91
  type: :development
104
92
  prerelease: false
105
93
  version_requirements: !ruby/object:Gem::Requirement
106
- none: false
107
94
  requirements:
108
- - - ! '>='
95
+ - - ">="
109
96
  - !ruby/object:Gem::Version
110
97
  version: '0'
111
- description: ! " Reyes is a gem...\n\n TO DO\n"
98
+ description: |2
99
+ Reyes is a gem...
100
+
101
+ TO DO
112
102
  email:
113
103
  - security@stripe.com
114
104
  executables:
@@ -116,10 +106,10 @@ executables:
116
106
  extensions: []
117
107
  extra_rdoc_files: []
118
108
  files:
119
- - .gitignore
120
- - .rubocop-disables.yml
121
- - .rubocop.yml
122
- - .ruby-version
109
+ - ".gitignore"
110
+ - ".rubocop-disables.yml"
111
+ - ".rubocop.yml"
112
+ - ".ruby-version"
123
113
  - Gemfile
124
114
  - README.md
125
115
  - Rakefile
@@ -146,29 +136,25 @@ files:
146
136
  - reyes.gemspec
147
137
  homepage: https://github.com/stripe/reyes/
148
138
  licenses: []
139
+ metadata: {}
149
140
  post_install_message:
150
141
  rdoc_options: []
151
142
  require_paths:
152
143
  - lib
153
144
  required_ruby_version: !ruby/object:Gem::Requirement
154
- none: false
155
145
  requirements:
156
- - - ! '>='
146
+ - - ">="
157
147
  - !ruby/object:Gem::Version
158
148
  version: 1.9.3
159
149
  required_rubygems_version: !ruby/object:Gem::Requirement
160
- none: false
161
150
  requirements:
162
- - - ! '>='
151
+ - - ">="
163
152
  - !ruby/object:Gem::Version
164
153
  version: '0'
165
- segments:
166
- - 0
167
- hash: -3798691146626456435
168
154
  requirements: []
169
155
  rubyforge_project:
170
- rubygems_version: 1.8.23.2
156
+ rubygems_version: 2.2.3
171
157
  signing_key:
172
- specification_version: 3
158
+ specification_version: 4
173
159
  summary: Reyes manages IPTables rules based on EC2 security groups.
174
160
  test_files: []