trusted-sandbox 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e79ee5b95826f3f6b958d64ba41aa5bc69698be
-  data.tar.gz: 674ce0e484bc9f25a1daadd890806ec5cbec1c49
+  metadata.gz: e5f75b96f03f9ca8924a9118d1c7d21150bdbd8b
+  data.tar.gz: 31f575d8c76f7ea9626d064730d7a0e11ba6aa73
 SHA512:
-  metadata.gz: 758f1b48f60299af80576785a12b6c19e3d1e93d119c5fc54922d36b943585cc4114639cae7db200003b04b6782491813a7eaf506d7936fb300093307ffbe445
-  data.tar.gz: 0ebb3139a9378b6dda3bc53251bbcbc04b6f78d5e739bcdec0a91a59fc66a425207772355d8f03d867ecf29b9d8406948c175136da77764124f81d167ac938f1
+  metadata.gz: 98b4ad0606c946a56b08578b14378eb0e3ad43163c84cfe46731b07e61b9c7f89a78eea674567b565ce59d24f3746d235bdeac390649d96bb8122a9987bf29fc
+  data.tar.gz: 1ebac5f5156d49a7688da383b157d7b115fd7ea6e57e77f39b56fb23da25f6a403b2cf545d0b2dae7bbc17e7d38d4a70a2c1c7775bad4a9da75f61ca3b291ce3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusted-sandbox (0.1.3)
+    trusted-sandbox (0.1.5)
       docker-api (~> 1.13)
       thor (~> 0.19)
 

data/README.md

@@ -77,12 +77,13 @@ an earlier version. Refer to the Docker documentation to see how to install the
 
 Note that on a Linux server the docker daemon runs as root, and the root user owns the socket used to connect to the
 daemon. In order to avoid the need to run your application with sudo privileges, add the application user to the
-`docker` group (keep `${USER}` for the connected user or change to suit your needs):
+`docker` group:
 ```
+# keep `${USER}` for the connected user or change to suit your needs
 $ sudo gpasswd -a ${USER} docker
 $ sudo service docker.io restart
 ```
-then reconnect to your shell session and try the following (without sudo):
+then reconnect to shell session and try the following (without sudo):
 ```
 $ docker images
 ```
@@ -136,6 +137,8 @@ environment variables.
 Trusted Sandbox uses the `docker-api` gem to communicate with docker. `docker-api`'s defaults work quite well for a
 Linux host, and you should be good by omitting `docker_url` and `docker_cert_path` all together.
 
+The following configurations work for a Mac OS host:
+
 ```ruby
 # If omitted ENV['DOCKER_HOST'] is used. If it is not set, docker-api defaults are used.
 docker_url: https://192.168.59.103:2376
@@ -443,9 +446,6 @@ You should not override user quota related parameters, as they must be prepared
 Trusted Sandbox comes with one ready-to-use image that includes Ruby 2.1.2. It is hosted on Docker Hub under
 `vaharoni/trusted_sandbox:ruby-2.1.2.v2`.
 
-We are actively looking for contributors who are willing to help expand the library of Docker images to support other
-languages and environments.
-
 To use a different image from your Docker Hub account simply change the configuration parameters in the YAML file.
 
 To customize the provided images, run the following. It will copy the image definition to your current directory under

data/lib/trusted_sandbox.rb

@@ -33,7 +33,7 @@ module TrustedSandbox
     return {} unless yaml_path
 
     env ||= ENV['TRUSTED_SANDBOX_ENV'] || ENV['RAILS_ENV'] || 'development'
-    YAML.load_file(yaml_path)[env]
+    YAML.load_file(yaml_path)[env] || {}
   end
 
   def self.uid_pool

data/lib/trusted_sandbox/version.rb

@@ -1,3 +1,3 @@
 module TrustedSandbox
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/spec/lib/trusted_sandbox_spec.rb

@@ -1,6 +1,75 @@
 require 'spec_helper'
 
 describe TrustedSandbox do
+  describe '#config_overrides_from_file' do
+    context 'when file does not exist' do
+      before do
+        stub(File).exist? { false }
+      end
+
+      it 'returns empty hash' do
+        TrustedSandbox.config_overrides_from_file.should == {}
+      end
+    end
+
+    context 'when file exists' do
+      before do
+        stub(File).exist? { true }
+      end
+
+      context 'no environment' do
+        before do
+          @dev_hash = {'dev' => true}
+          stub(YAML).load_file { {'development' => @dev_hash} }
+        end
+
+        it 'returns the hash from the development environment' do
+          TrustedSandbox.config_overrides_from_file.should == @dev_hash
+        end
+      end
+
+      context 'test environment' do
+        before do
+          @test_hash = {'test' => true}
+          stub(YAML).load_file { {'test' => @test_hash} }
+        end
+
+        context 'from TRUSTED_SANDBOX_ENV' do
+          before do
+            ENV['TRUSTED_SANDBOX_ENV'] = 'test'
+          end
+
+          it 'returns the hash from the test environment' do
+            TrustedSandbox.config_overrides_from_file.should == @test_hash
+          end
+        end
+
+        context 'from RAILS_ENV' do
+          before do
+            ENV['RAILS_ENV'] = 'test'
+          end
+
+          it 'returns the hash from the test environment' do
+            TrustedSandbox.config_overrides_from_file.should == @test_hash
+          end
+        end
+      end
+
+      context 'file does not contain environment key' do
+        before do
+          @dev_hash = {'dev' => true}
+          stub(YAML).load_file { {'development' => @dev_hash} }
+          ENV['TRUSTED_SANDBOX_ENV'] = 'test'
+        end
+
+        it 'returns an empty hash' do
+          TrustedSandbox.config_overrides_from_file.should == {}
+        end
+      end
+    end
+
+  end
+
   describe '#with_options' do
     before do
       @default_network_access = TrustedSandbox.config.network_access

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusted-sandbox
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Amit Aharoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler