gris 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6718fa8810cdc849424f62dfad2e12c47c3b9d38
-  data.tar.gz: 82de9f1d439386614bcf8a037382c0c8a40eee24
+  metadata.gz: 7b4abfeb569455ac1557220759fed00d91b12698
+  data.tar.gz: 5a07d55604ba7d0f070a03e3d1066796ceab5f60
 SHA512:
-  metadata.gz: d4afc70c3a4e8f2c74283e8f9b8b4edca4c417327774d0efe1fe4fc850f681d0ab955b3def9da585580165ecbd0b8ca71a5fe312a74079559f6f5d371fc0b60c
-  data.tar.gz: 4fa100baca239ebe31e2a2f79862c98d4fd83ded2c1136b1741122e8b6ff1b8285282471ba8d09a64290a5f99982a918969fec401551cc6f6e3e391694738a57
+  metadata.gz: df3b86ca754667587d31fe5d70cb079c890009f0c31ee8588425e12e058bea9514e9848326476d582856e9f312d235df6e380ad7e32672a7e70f47d8685335e3
+  data.tar.gz: 57159e0bec4873868f9437f49c14694720775730af8210b623f4866a3b53ba5dce81349c68fae28f95ac12cd57b7ee467941f864acaea2f19f8dd52080f268e0

data/Gemfile

@@ -14,4 +14,5 @@ end
 group :test do
   gem 'childprocess'
   gem 'hyperclient'
+  gem 'fakefs'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gris (0.4.4)
+    gris (0.4.5)
       activesupport (~> 4.2, >= 4.2.0)
       chronic (~> 0.10.0)
       dalli (~> 2.7)
@@ -59,6 +59,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     equalizer (0.0.11)
+    fakefs (0.6.7)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     faraday-digestauth (0.2.1)
@@ -90,7 +91,7 @@ GEM
     grape-roar (0.3.0)
       grape
       roar (>= 1.0)
-    grape-swagger (0.10.1)
+    grape-swagger (0.10.2)
       grape (>= 0.8.0)
       grape-entity
     hashie (3.4.2)
@@ -182,6 +183,7 @@ DEPENDENCIES
   bundler (~> 1)
   byebug
   childprocess
+  fakefs
   fasterer
   gris!
   hyperclient

data/README.md

@@ -34,6 +34,13 @@ $ bundle install
 
 ---
 
+### Quickstart Demo(s)
+
+You can find example pull requests providing walkthroughs of new app set up here:
+[https://github.com/artsy/gris-demo/pulls](https://github.com/artsy/gris-demo/pulls)
+
+---
+
 ### Usage
 
 ##### CLI & Generators
@@ -74,4 +81,6 @@ or, if you have an instance, use
 
 ### The name
 
-Gris is named for [Juan Gris](https://www.artsy.net/artist/juan-gris) (but also works in the wine-based word context of Grape and Napa). Cleverness!
+Gris is named for the Cubist painter [Juan Gris](https://www.artsy.net/artist/juan-gris).
+
+![juan-gris-bottles-and-bowl-1911](https://cloud.githubusercontent.com/assets/197336/9348124/5ef5531c-4600-11e5-8318-4858076d7c6d.jpg)

data/lib/gris/setup.rb

@@ -14,14 +14,11 @@ module Gris
     # Returns secrets added to config/secrets.yml.
     def secrets
       @secrets ||= begin
-        secrets = ActiveSupport::OrderedOptions.new
+        secrets = Hashie::Mash.new
         yaml = 'config/secrets.yml'
-        if File.exist?(yaml)
-          require 'erb'
-          # safe_load yaml, whitelist_classes = [], whitelist_symbols = [], aliases = false, filename = nil
-          all_secrets = YAML.safe_load(ERB.new(IO.read(yaml)).result, [], [], true) || {}
-          env_secrets = all_secrets[Gris.env]
-          secrets.merge!(env_secrets.symbolize_keys) if env_secrets
+        if File.exist? yaml
+          env_secrets = Hashie::Mash.load(yaml)[Gris.env]
+          secrets.merge!(env_secrets) if env_secrets
         end
         secrets
       end

data/lib/gris/version.rb

@@ -1,5 +1,5 @@
 module Gris
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 
   class Version
     class << self

data/spec/fixtures/secrets.yml

@@ -0,0 +1,8 @@
+default: &default
+  service_name: my_default_app
+  base_url: https://www.youtube.com/watch?v=RI6973HNh8Y
+  permitted_tokens: my-token,another-token
+
+test:
+  <<: *default
+  service_name: my_test_app

data/spec/grape_extensions/authentication_helpers_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe Gris::AuthenticationHelpers do
+  include_context 'with secrets from config/secrets.yml'
   context 'without permitted token' do
     before(:each) do
-      Gris.secrets.permitted_tokens = 'my-token,another-token'
       @helper = SpecApiAuthHelper.new
     end
 

data/spec/identity_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
-require 'gris/identity'
 
 describe Gris::Identity do
+  include_context 'with secrets from config/secrets.yml'
+
   before do
     allow(Process).to receive(:pid).and_return(123)
     allow(Gris::Identity).to receive(:hostname).and_return('system-hostname')
@@ -10,65 +11,63 @@ describe Gris::Identity do
 
   context '#health' do
     it 'includes name' do
-      expect(Gris::Identity.health[:name]).to eq(Gris::Identity.name)
+      expect(Gris::Identity.health[:name]).to eq Gris::Identity.name
     end
     it 'includes base_url' do
-      expect(Gris::Identity.health[:base_url]).to eq(Gris::Identity.base_url)
+      expect(Gris::Identity.health[:base_url]).to eq Gris::Identity.base_url
     end
     it 'includes hostname' do
-      expect(Gris::Identity.health[:hostname]).to eq(Gris::Identity.hostname)
+      expect(Gris::Identity.health[:hostname]).to eq Gris::Identity.hostname
     end
     it 'includes revision' do
-      expect(Gris::Identity.health[:revision]).to eq(Gris::Identity.revision)
+      expect(Gris::Identity.health[:revision]).to eq Gris::Identity.revision
     end
     it 'includes pid' do
-      expect(Gris::Identity.health[:pid]).to eq(Gris::Identity.pid)
+      expect(Gris::Identity.health[:pid]).to eq Gris::Identity.pid
     end
     it 'includes parent_pid' do
-      expect(Gris::Identity.health[:parent_pid]).to eq(Gris::Identity.parent_pid)
+      expect(Gris::Identity.health[:parent_pid]).to eq Gris::Identity.parent_pid
     end
     it 'includes platform' do
-      expect(Gris::Identity.health[:platform]).to eq(Gris::Identity.platform)
+      expect(Gris::Identity.health[:platform]).to eq Gris::Identity.platform
     end
   end
 
   context '#name' do
     it 'returns the Gris.secrets.service_name when specified' do
-      Gris.secrets.service_name = 'my-service'
-      expect(Gris::Identity.name).to eq('my-service')
+      expect(Gris::Identity.name).to eq 'my_test_app'
     end
   end
 
   context '#hostname' do
     it 'returns the value of the hostname system call and doesn\'t make a second system call' do
       expect(Gris::Identity).to_not receive(:`).with('hostname')
-      expect(Gris::Identity.hostname).to eq('system-hostname')
+      expect(Gris::Identity.hostname).to eq 'system-hostname'
     end
   end
 
   context '#revision' do
     it 'returns the value of the \'git rev-parse HEAD\' system call and doesn\'t make a second system call' do
       expect(Gris::Identity).to_not receive(:`).with('git rev-parse HEAD')
-      expect(Gris::Identity.revision).to eq('12345')
+      expect(Gris::Identity.revision).to eq '12345'
     end
   end
 
   context '#pid' do
     it 'returns the process ID value' do
-      expect(Gris::Identity.pid).to eq(123)
+      expect(Gris::Identity.pid).to eq 123
     end
   end
 
   context '#platform_revision' do
     it 'returns the current version of the platform gem' do
-      expect(Gris::Identity.platform_revision).to eq(Gris::VERSION)
+      expect(Gris::Identity.platform_revision).to eq Gris::VERSION
     end
   end
 
   context '#base_url' do
-    it 'returns the Gris.secrets.base_url when specied' do
-      Gris.secrets.base_url = 'my-base-url'
-      expect(Gris::Identity.base_url).to eq('my-base-url')
+    it 'returns the Gris.secrets.base_url when specified' do
+      expect(Gris::Identity.base_url).to eq 'https://www.youtube.com/watch?v=RI6973HNh8Y'
     end
   end
 end

data/spec/secrets_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe 'Gris.secrets' do
+  context 'with a local yaml file' do
+    include_context 'with secrets from config/secrets.yml'
+
+    it 'sets the secret property corresponding to the current Gris.env' do
+      expect(Gris.secrets.service_name).to eq 'my_test_app'
+    end
+
+    it 'sets the secret property corresponding to the default value' do
+      expect(Gris.secrets.base_url).to eq 'https://www.youtube.com/watch?v=RI6973HNh8Y'
+    end
+  end
+
+  context 'without a local yaml file' do
+    [true, 1, 0, 'anystring'].each do |value|
+      it "returns true when value is #{value.inspect}" do
+        Gris.secrets.notifications_enabled = value
+        expect(Gris.secrets.notifications_enabled?).to be_truthy
+      end
+    end
+
+    [false, nil].each do |value|
+      it "returns false when value is #{value.inspect}" do
+        Gris.secrets.notifications_enabled = value
+        expect(Gris.secrets.notifications_enabled?).to_not be_truthy
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'childprocess'
 require 'gris'
 require 'gris/cli'
 require 'rack/test'
+require 'fakefs/spec_helpers'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

data/spec/support/spec_secrets_helper.rb

@@ -0,0 +1,11 @@
+shared_context 'with secrets from config/secrets.yml' do
+  include FakeFS::SpecHelpers
+
+  before do
+    content = IO.read 'spec/fixtures/secrets.yml'
+    FileUtils.mkdir_p 'config'
+    File.open('config/secrets.yml', 'w+') do |file|
+      file.write content
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gris
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Dylan Fareed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -385,6 +385,7 @@ files:
 - lib/tasks/routes.rake
 - spec/cache_spec.rb
 - spec/caching_spec.rb
+- spec/fixtures/secrets.yml
 - spec/generators/api_generator_spec.rb
 - spec/generators/migration_generator_spec.rb
 - spec/generators/scaffold_generator_spec.rb
@@ -396,6 +397,7 @@ files:
 - spec/integration/application_error_response_spec.rb
 - spec/integration/token_authentication_spec.rb
 - spec/output_formatters/root_presenter_spec.rb
+- spec/secrets_spec.rb
 - spec/spec_helper.rb
 - spec/support/caching_helper.rb
 - spec/support/integration_setup.rb
@@ -403,6 +405,7 @@ files:
 - spec/support/spec_api_error_helper.rb
 - spec/support/spec_crud_helper.rb
 - spec/support/spec_generators_helper.rb
+- spec/support/spec_secrets_helper.rb
 - spec/version_spec.rb
 homepage: http://github.com/artsy/gris/
 licenses:
@@ -431,6 +434,7 @@ summary: A simple api microservice generator framework.
 test_files:
 - spec/cache_spec.rb
 - spec/caching_spec.rb
+- spec/fixtures/secrets.yml
 - spec/generators/api_generator_spec.rb
 - spec/generators/migration_generator_spec.rb
 - spec/generators/scaffold_generator_spec.rb
@@ -442,6 +446,7 @@ test_files:
 - spec/integration/application_error_response_spec.rb
 - spec/integration/token_authentication_spec.rb
 - spec/output_formatters/root_presenter_spec.rb
+- spec/secrets_spec.rb
 - spec/spec_helper.rb
 - spec/support/caching_helper.rb
 - spec/support/integration_setup.rb
@@ -449,4 +454,5 @@ test_files:
 - spec/support/spec_api_error_helper.rb
 - spec/support/spec_crud_helper.rb
 - spec/support/spec_generators_helper.rb
+- spec/support/spec_secrets_helper.rb
 - spec/version_spec.rb