heroploy 0.0.6 → 0.0.7.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43d2a2c41a7f6cf4df2a3bd702909a8f3187e86b
-  data.tar.gz: d38defbf1034e876710827b2df4f389f4775e614
+  metadata.gz: 14831f804b67f92cda8c6114f55f8b62979f57d2
+  data.tar.gz: e042e03695b5e29b37c0bea862032cffe540248e
 SHA512:
-  metadata.gz: fc5fd21d2bdd1642f9c5c1abc145072b07d7744df3b51d76be6a9d17562bf1e325accadbd4536910f4538d15fa1974b238d543f54387ec74197f9dc05f80bc10
-  data.tar.gz: c34743eeda303b04f3865f83f1efdb8951df103b086c0d2dbda6b7280c5e174a0fb2eb97244fed6eb5a2a705b9acd167ee24f6014008de52e94f660163ba692a
+  metadata.gz: 81ebc92f623e7cd3622dbed4a8aaddb919567dde3d98078242c7738bac34350efbaaa2c3a3c2bd92869dbcdafd939aae54208e8370408d45e9699ba3932bc2b7
+  data.tar.gz: dcf831f48268d598dfb1b53d3bcbc05b93e31656b123556dc0b5b674c42b8c83577f7cbc8dd6a0bfb3eb11bc8a6903c1afb1ca14feb156f8354c69af0814a35c

data/lib/heroploy/commands/shell.rb

@@ -1,3 +1,5 @@
+require 'rake/tasklib'
+
 module Heroploy
   class Shell
     extend FileUtils

data/lib/heroploy/config/deployment_config.rb

@@ -2,6 +2,8 @@ require 'heroploy/config/deployment_config'
 require 'heroploy/config/environment'
 require 'heroploy/config/shared_env'
 require 'heroploy/config/remote_config'
+require 'heroploy/commands/shell'
+require 'heroploy/commands/git'
 
 module Heroploy
   module Config
@@ -10,6 +12,8 @@ module Heroploy
       attr_accessor :environments
       attr_accessor :shared_env
       attr_accessor :remote_configs
+      
+      include Commands::Git
 
       def [](env_name)
         environments.select{ |env| env.name == env_name }.first
@@ -35,6 +39,19 @@ module Heroploy
           self[env_config.name].variables.merge!(env_config.variables)
         end
       end
+      
+      def load_remotes!
+        unless remote_configs.nil?
+          remote_configs.each do |remote_config|
+            git_clone(remote_config.repository, remote_config.name) do
+              remote_config.files.each do |filename|
+                config_file = File.join(Dir.pwd, remote_config.name, filename)
+                merge_config(Heroploy::Config::DeploymentConfig.load(config_file))
+              end
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/heroploy/config/shared_env.rb

@@ -4,7 +4,7 @@ module Heroploy
       attr_accessor :required
       attr_accessor :variables
       
-      def initialize(attrs)
+      def initialize(attrs = {})
         attrs ||= {}
         @required = attrs['required'] || []
         @variables = attrs['variables'] || {}

data/lib/heroploy/config/var_reader.rb

@@ -0,0 +1,37 @@
+require 'heroploy/config/deployment_config'
+
+module Heroploy
+  module Config
+    class VarReader
+      attr_accessor :deployment_config
+      
+      def deployment_config
+        @deployment_config ||= begin
+          config = Heroploy::Config::DeploymentConfig.load
+          config.load_remotes! unless config.nil?
+          config
+        end
+      end
+      
+      def env_matcher_name
+        "Rails.env[#{Rails.env}]"
+      end
+      
+      def [](var_name)
+        config_var = ENV[var_name.to_s]
+        config_var ||= begin
+          environment = deployment_config[env_matcher_name]
+          environment.variables[var_name.to_s] unless environment.nil?
+        end
+        config_var ||= begin
+          shared_env = deployment_config.shared_env
+          shared_env.variables[var_name.to_s] unless shared_env.nil?
+        end
+      end
+    end
+  end
+  
+  def self.config_vars
+    @config_vars ||= Config::VarReader.new
+  end
+end

data/lib/heroploy/tasks/deploy_task_lib.rb

@@ -33,16 +33,7 @@ module Heroploy
       def define_load_configs_task
         desc 'load remote configs'
         task :load_remote_configs do
-          unless deployment_config.remote_configs.nil?
-            deployment_config.remote_configs.each do |remote_config|
-              git_clone(remote_config.repository, remote_config.name) do
-                remote_config.files.each do |filename|
-                  config_file = File.join(Dir.pwd, remote_config.name, filename)
-                  deployment_config.merge_config(Heroploy::Config::DeploymentConfig.load(config_file))
-                end
-              end
-            end
-          end
+          deployment_config.load_remotes!
         end
       end
     

data/lib/heroploy/version.rb

@@ -1,3 +1,3 @@
 module Heroploy
-  VERSION = "0.0.6"
+  VERSION = "0.0.7.beta"
 end

data/lib/heroploy.rb

@@ -2,3 +2,4 @@ require "rails"
 
 require "heroploy/version"
 require "heroploy/engine" if defined?(Rails) && Rails::VERSION::MAJOR >= 3
+require "heroploy/config/var_reader"

data/spec/factories.rb

@@ -39,8 +39,15 @@ FactoryGirl.define do
     end
   end
   
+  factory :shared_env, :class => Heroploy::Config::SharedEnv do
+    required []
+    variables {}
+  end
+  
   factory :deployment_config, :class => Heroploy::Config::DeploymentConfig do
     travis_repo "my-travis-user/my-travis-repo"
+    
+    shared_env nil
 
     environments {
       [

data/spec/lib/heroploy/config/var_reader_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe Heroploy::Config::VarReader do
+  subject(:var_reader) { Heroploy::Config::VarReader.new }
+  
+  describe "deployment_config" do
+    let(:expected_config) { build(:deployment_config) }
+    before { allow(Heroploy::Config::DeploymentConfig).to receive(:load).and_return(expected_config) }
+    
+    it "loads and returns the deployment config" do
+      expect(var_reader.deployment_config).to eq(expected_config)
+    end
+    
+    it "caches the result" do
+      expect(Heroploy::Config::DeploymentConfig).to receive(:load).once
+      var_reader.deployment_config
+      var_reader.deployment_config
+    end
+  end
+
+  describe "[]" do
+    context "if an environment variable is defined" do
+      before { allow(ENV).to receive(:[]).with('foo').and_return('bar') }
+  
+      it "returns the value of the environment variable" do
+        expect(var_reader[:foo]).to eq('bar')
+      end
+    end
+    
+    context "if an environment matcher is defined" do
+      let(:deployment_config) do
+        build(:deployment_config,
+          :shared_env => build(:shared_env, :variables => {'fizz' => 'buzz'}),
+          :environments => [
+            build(:environment,
+              :name => 'Rails.env[test]',
+              :variables => {'foo' => 'baz'}
+            )
+          ]
+        )
+      end
+      
+      before do
+        allow(Heroploy::Config::DeploymentConfig).to receive(:load).
+          and_return(deployment_config)
+        
+        allow(Rails).to receive(:env).and_return('test')
+      end
+      
+      it "returns the variable for the matched environment" do
+        expect(var_reader[:foo]).to eq('baz')
+      end
+      
+      it "returns shared environment variables" do
+        expect(var_reader[:fizz]).to eq('buzz')
+      end
+    end
+    
+    context "if no variables are defined" do
+      before { allow(Heroploy::Config::DeploymentConfig).to receive(:load).and_return(build(:deployment_config)) }
+      
+      it "returns nil" do
+        expect(var_reader[:foo]).to eq(nil)
+      end
+    end
+  end  
+end

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ require 'heroploy/tasks/deploy_task_lib'
 require 'heroploy/config/deployment_config'
 require 'heroploy/config/environment'
 require 'heroploy/config/environment_checks'
+require 'heroploy/config/var_reader'
 
 require 'support/shell_support'
 require 'support/shared_contexts/rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroploy
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7.beta
 platform: ruby
 authors:
 - John Brunton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,6 +151,7 @@ files:
 - lib/heroploy/config/environment_checks.rb
 - lib/heroploy/config/remote_config.rb
 - lib/heroploy/config/shared_env.rb
+- lib/heroploy/config/var_reader.rb
 - lib/heroploy/engine.rb
 - lib/heroploy/tasks/check_task_lib.rb
 - lib/heroploy/tasks/deploy_task_lib.rb
@@ -169,6 +170,7 @@ files:
 - spec/lib/heroploy/config/environment_spec.rb
 - spec/lib/heroploy/config/remote_config_spec.rb
 - spec/lib/heroploy/config/shared_env_spec.rb
+- spec/lib/heroploy/config/var_reader_spec.rb
 - spec/lib/heroploy/tasks/check_all_spec.rb
 - spec/lib/heroploy/tasks/check_branch_spec.rb
 - spec/lib/heroploy/tasks/check_config_spec.rb
@@ -197,9 +199,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -218,6 +220,7 @@ test_files:
 - spec/lib/heroploy/config/environment_spec.rb
 - spec/lib/heroploy/config/remote_config_spec.rb
 - spec/lib/heroploy/config/shared_env_spec.rb
+- spec/lib/heroploy/config/var_reader_spec.rb
 - spec/lib/heroploy/tasks/check_all_spec.rb
 - spec/lib/heroploy/tasks/check_branch_spec.rb
 - spec/lib/heroploy/tasks/check_config_spec.rb