gris 0.3.3 → 0.3.4

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 (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +4 -4
  3. data/README.md +2 -1
  4. data/gris.gemspec +1 -1
  5. data/lib/gris/setup.rb +2 -1
  6. data/lib/gris/version.rb +1 -1
  7. metadata +2 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 63dc9c9cbec2f39bff178b8ff6f54f570d1e25eb
4
- data.tar.gz: 7c5aefd68fc65989cc4aee1756e7d15c5a590034
3
+ metadata.gz: 930b8c103850b5df577c6fbadb17796254df8414
4
+ data.tar.gz: ab17808cd5babe4fe9157efbe94c0546c63d7006
5
5
  SHA512:
6
- metadata.gz: 06c34f7370cfbb8295335716946a22a004a3ea5226fe969d2514a75ef53b140e86790fe2edab5963de7ca7c7a9cfee368bb66a58ea3ee0b24fe0933f0384d72d
7
- data.tar.gz: 46d8af94693a6d581a77b9cfb60dbc08955b3fedb4298c1a3631066aec0eed2f8d38e45fe3008665f0d1351d13b9de6674d7472132a4c179aaf290203cc6e2a7
6
+ metadata.gz: 0a8467849fc610d922a35cbdad6953d844c8ac0811163b88cd87975eb1897d95b919bf7326d9c099f3c5b3ae3b252f20613a7707bd82d83535417a0a232b05ad
7
+ data.tar.gz: d646bf62c87167831f1936c4103127f86a323ce52961048473cfa90a250cb8185c1e185ec862bb35b4d613d5da12432690890907cef6d54bfa2bbcd41e52af38
data/Gemfile.lock CHANGED
@@ -1,12 +1,12 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- gris (0.3.3)
4
+ gris (0.3.4)
5
5
  activesupport (~> 4.2, >= 4.2.0)
6
6
  chronic (~> 0.10.0)
7
7
  dalli (~> 2.7)
8
8
  git (~> 1.2, >= 1.2.8)
9
- grape (~> 0.11.0, >= 0.11.0)
9
+ grape (>= 0.11.0)
10
10
  grape-roar (~> 0.3.0, >= 0.3.0)
11
11
  grape-swagger (~> 0.10.0)
12
12
  hashie-forbidden_attributes (~> 0.1.0)
@@ -73,7 +73,7 @@ GEM
73
73
  ffi (1.9.8)
74
74
  futuroscope (0.1.11)
75
75
  git (1.2.9.1)
76
- grape (0.11.0)
76
+ grape (0.12.0)
77
77
  activesupport
78
78
  builder
79
79
  hashie (>= 2.1.0)
@@ -121,7 +121,7 @@ GEM
121
121
  parser (2.2.2.5)
122
122
  ast (>= 1.1, < 3.0)
123
123
  powerpack (0.1.1)
124
- rack (1.6.2)
124
+ rack (1.6.4)
125
125
  rack-accept (0.4.5)
126
126
  rack (>= 0.4)
127
127
  rack-mount (0.8.3)
data/README.md CHANGED
@@ -4,7 +4,8 @@
4
4
 
5
5
  It makes use of [Grape](https://github.com/intridea/grape), [Roar](https://github.com/apotonick/roar), [RSpec](http://rspec.info/), [Hyperclient](https://github.com/codegram/hyperclient), and [Active Record](https://github.com/rails/rails/tree/master/activerecord) with PostgreSQL among other excellent projects. Gris is derived from/inspired by the stellar and more sophisticated [Napa framework by Bellycard Inc.](https://github.com/bellycard/napa). We stand on the shoulders of tall people.
6
6
 
7
- [![Build Status](https://semaphoreci.com/api/v1/projects/aeb68b19-58b7-4015-885d-e989a3e96ca2/418227/shields_badge.svg)](https://semaphoreci.com/artsy/gris)
7
+ [![Build Status](https://semaphoreci.com/api/v1/projects/aeb68b19-58b7-4015-885d-e989a3e96ca2/418227/badge.svg)](https://semaphoreci.com/artsy-it/gris)
8
+
8
9
  [![Gem Version](https://badge.fury.io/rb/gris.svg)](http://badge.fury.io/rb/gris)
9
10
  [![Code Climate](https://codeclimate.com/github/artsy/gris/badges/gpa.svg)](https://codeclimate.com/github/artsy/gris)
10
11
  [![Dependency Status](https://gemnasium.com/artsy/gris.svg)](https://gemnasium.com/artsy/gris)
data/gris.gemspec CHANGED
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
23
23
  s.add_runtime_dependency 'rake', '~> 10.4', '>= 10.4.2'
24
24
  s.add_runtime_dependency 'git', '~> 1.2', '>= 1.2.8'
25
25
  s.add_runtime_dependency 'logging', '~> 2.0'
26
- s.add_runtime_dependency 'grape', '~> 0.11.0', '>= 0.11.0'
26
+ s.add_runtime_dependency 'grape', '>= 0.11.0'
27
27
  s.add_runtime_dependency 'grape-roar', '~> 0.3.0', '>= 0.3.0'
28
28
  s.add_runtime_dependency 'grape-swagger', '~> 0.10.0'
29
29
  s.add_runtime_dependency 'roar', '~> 1.0.1'
data/lib/gris/setup.rb CHANGED
@@ -18,7 +18,8 @@ module Gris
18
18
  yaml = 'config/secrets.yml'
19
19
  if File.exist?(yaml)
20
20
  require 'erb'
21
- all_secrets = YAML.load(ERB.new(IO.read(yaml)).result) || {}
21
+ # safe_load yaml, whitelist_classes = [], whitelist_symbols = [], aliases = false, filename = nil
22
+ all_secrets = YAML.safe_load(ERB.new(IO.read(yaml)).result, [], [], true) || {}
22
23
  env_secrets = all_secrets[Gris.env]
23
24
  secrets.merge!(env_secrets.symbolize_keys) if env_secrets
24
25
  end
data/lib/gris/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Gris
2
- VERSION = '0.3.3'
2
+ VERSION = '0.3.4'
3
3
 
4
4
  class Version
5
5
  class << self
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gris
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.3
4
+ version: 0.3.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dylan Fareed
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-17 00:00:00.000000000 Z
11
+ date: 2015-06-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -108,9 +108,6 @@ dependencies:
108
108
  name: grape
109
109
  requirement: !ruby/object:Gem::Requirement
110
110
  requirements:
111
- - - "~>"
112
- - !ruby/object:Gem::Version
113
- version: 0.11.0
114
111
  - - ">="
115
112
  - !ruby/object:Gem::Version
116
113
  version: 0.11.0
@@ -118,9 +115,6 @@ dependencies:
118
115
  prerelease: false
119
116
  version_requirements: !ruby/object:Gem::Requirement
120
117
  requirements:
121
- - - "~>"
122
- - !ruby/object:Gem::Version
123
- version: 0.11.0
124
118
  - - ">="
125
119
  - !ruby/object:Gem::Version
126
120
  version: 0.11.0