Skip to content
This repository has been archived by the owner on Feb 11, 2019. It is now read-only.

Commit

Permalink
Merge pull request #33 from tablexi/develop
Browse files Browse the repository at this point in the history 
Promote Develop to Master
  • Loading branch information
@phoolish
phoolish authored Mar 28, 2018
2 parents 8cf8928 + 0194552 commit 7d9f025
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 55 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'http://rubygems.org'
source 'https://rubygems.org'

ruby '2.4.1'

Expand Down
138 changes: 84 additions & 54 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GEM
remote: http://rubygems.org/
remote: https://rubygems.org/
specs:
activesupport (5.1.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -8,17 +8,16 @@ GEM
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
artifactory (2.8.2)
ast (2.3.0)
aws-sdk (2.10.53)
aws-sdk-resources (= 2.10.53)
aws-sdk-core (2.10.53)
aws-sdk (2.10.102)
aws-sdk-resources (= 2.10.102)
aws-sdk-core (2.10.102)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.10.53)
aws-sdk-core (= 2.10.53)
aws-sdk-resources (2.10.102)
aws-sdk-core (= 2.10.102)
aws-sigv4 (1.0.2)
backports (3.8.0)
backports (3.10.3)
berkshelf (6.3.1)
buff-config (~> 2.0)
buff-extensions (~> 2.0)
Expand Down Expand Up @@ -50,10 +49,10 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
chef (12.21.12)
chef (12.21.26)
addressable
bundler (>= 1.10)
chef-config (= 12.21.12)
chef-config (= 12.21.26)
chef-zero (>= 4.8, < 13)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
Expand Down Expand Up @@ -82,7 +81,7 @@ GEM
chef-api (0.7.1)
logify (~> 0.1)
mime-types
chef-config (12.21.12)
chef-config (12.21.26)
addressable
fuzzyurl
mixlib-config (~> 2.0)
Expand All @@ -93,29 +92,31 @@ GEM
mixlib-log (~> 1.3)
rack (~> 2.0)
uuidtools (~> 2.1)
chefspec (7.1.0)
chefspec (7.1.1)
chef (>= 12.14.89)
fauxhai (>= 4, < 6)
rspec (~> 3.0)
cleanroom (1.0.0)
coderay (1.1.2)
concurrent-ruby (1.0.5)
cucumber-core (2.0.0)
backports (~> 3.6)
gherkin (~> 4.0)
cucumber-core (3.1.0)
backports (>= 3.8.0)
cucumber-tag_expressions (~> 1.1.0)
gherkin (>= 5.0.0)
cucumber-tag_expressions (1.1.1)
diff-lcs (1.3)
erubis (2.7.0)
excon (0.59.0)
faraday (0.13.1)
multipart-post (>= 1.2, < 3)
faraday-http-cache (2.0.0)
faraday (~> 0.8)
fauxhai (5.4.0)
fauxhai (5.5.0)
net-ssh
ffi (1.9.18)
ffi-yajl (2.3.1)
libyajl2 (~> 1.2)
foodcritic (11.4.0)
foodcritic (12.2.2)
cucumber-core (>= 1.3)
erubis
ffi-yajl (~> 2.0)
Expand All @@ -125,7 +126,7 @@ GEM
treetop (~> 1.4)
formatador (0.2.5)
fuzzyurl (0.9.0)
gherkin (4.1.3)
gherkin (5.0.0)
github_changelog_generator (1.14.3)
activesupport
faraday-http-cache
Expand All @@ -134,10 +135,12 @@ GEM
rainbow (>= 2.1)
rake (>= 10.0)
retriable (~> 2.1)
guard (2.14.1)
gssapi (1.2.0)
ffi (>= 1.0.1)
guard (2.14.2)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (~> 1.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
Expand All @@ -158,8 +161,10 @@ GEM
guard-rubocop (1.3.0)
guard (~> 2.0)
rubocop (~> 0.20)
gyoku (1.3.1)
builder (>= 2.1.2)
hashie (3.5.6)
highline (1.7.8)
highline (1.7.10)
hitimes (1.2.6)
httpclient (2.8.3)
i18n (0.8.6)
Expand All @@ -169,7 +174,7 @@ GEM
json (2.1.0)
kitchen-docker (2.6.0)
test-kitchen (>= 1.0.0)
kitchen-ec2 (1.3.2)
kitchen-ec2 (2.0.0)
aws-sdk (~> 2)
excon
multi_json
Expand All @@ -182,6 +187,10 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
logify (0.2.0)
lumberjack (1.0.12)
method_source (0.9.0)
Expand All @@ -196,8 +205,7 @@ GEM
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
mixlib-install (2.1.12)
artifactory
mixlib-install (3.8.0)
mixlib-shellout
mixlib-versioning
thor
Expand All @@ -220,14 +228,15 @@ GEM
net-ssh-gateway (>= 1.2.0)
net-telnet (0.1.1)
nio4r (2.1.0)
nokogiri (1.8.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
nori (2.6.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
octokit (4.7.0)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (8.24.1)
ohai (8.25.1)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
Expand All @@ -239,21 +248,20 @@ GEM
plist (~> 3.1)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
parallel (1.12.0)
parser (2.4.0.0)
ast (~> 2.2)
parallel (1.12.1)
parser (2.4.0.2)
ast (~> 2.3)
plist (3.3.0)
polyglot (0.3.5)
powerpack (0.1.1)
proxifier (1.0.3)
pry (0.11.1)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.0)
public_suffix (3.0.1)
rack (2.0.3)
rainbow (2.2.2)
rake
rake (12.1.0)
rainbow (3.0.0)
rake (12.3.0)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
Expand All @@ -277,42 +285,44 @@ GEM
retryable (~> 2.0)
semverse (~> 2.0)
varia_model (~> 0.6)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-core (3.7.0)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-support (~> 3.7.0)
rspec-its (1.2.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.6.0)
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (0.50.0)
rubocop (0.52.1)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
parser (>= 2.4.0.2, < 3.0)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 3.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
ruby_gntp (0.3.4)
rubyntlm (0.6.2)
rubyzip (1.2.1)
rufus-lru (1.1.0)
safe_yaml (1.0.4)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
semverse (2.0.0)
serverspec (2.41.0)
serverspec (2.41.3)
multi_json
rspec (~> 3.0)
rspec-its
Expand All @@ -322,7 +332,7 @@ GEM
solve (4.0.0)
molinillo (~> 0.6)
semverse (>= 1.1, < 3.0)
specinfra (2.72.0)
specinfra (2.72.1)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
Expand All @@ -332,19 +342,22 @@ GEM
logify (~> 0.2)
syslog-logger (1.6.8)
systemu (2.6.5)
test-kitchen (1.17.0)
mixlib-install (>= 1.2, < 3.0)
test-kitchen (1.19.2)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
net-ssh (>= 2.9, < 5.0)
net-ssh-gateway (~> 1.2)
safe_yaml (~> 1.0)
thor (~> 0.19, < 0.19.2)
winrm (~> 2.0)
winrm-elevated (~> 1.0)
winrm-fs (~> 1.1.0)
thor (0.19.1)
thread_safe (0.3.6)
timers (4.0.4)
hitimes
treetop (1.6.8)
treetop (1.6.9)
polyglot (~> 0.3)
tzinfo (1.2.3)
thread_safe (~> 0.1)
Expand All @@ -353,6 +366,23 @@ GEM
varia_model (0.6.0)
buff-extensions (~> 2.0)
hashie (>= 2.0.2, < 4.0.0)
winrm (2.2.3)
builder (>= 2.1.2)
erubis (~> 2.7)
gssapi (~> 1.2)
gyoku (~> 1.0)
httpclient (~> 2.2, >= 2.2.0.2)
logging (>= 1.6.1, < 3.0)
nori (~> 2.0)
rubyntlm (~> 0.6.0, >= 0.6.1)
winrm-elevated (1.1.0)
winrm (~> 2.0)
winrm-fs (~> 1.0)
winrm-fs (1.1.1)
erubis (~> 2.7)
logging (>= 1.6.1, < 3.0)
rubyzip (~> 1.1)
winrm (~> 2.0)
wmi-lite (1.0.0)

PLATFORMS
Expand Down Expand Up @@ -383,4 +413,4 @@ RUBY VERSION
ruby 2.4.1p111

BUNDLED WITH
1.15.0
1.16.1

0 comments on commit 7d9f025

Please sign in to comment.