travis-deploy 0.1.0 → 0.2.0

data/.travis.yml

@@ -1,6 +1,5 @@
 script: rspec
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - jruby

data/lib/travis/deploy.rb

@@ -17,9 +17,12 @@ module Travis
     method_option :env,    :aliases => '-e', :type => :string
     method_option :source, :aliases => '-s', :type => :string
     method_option :backup, :aliases => '-b', :type => :boolean, :default => false
+    method_option :pretend, :type => :boolean, :default => false
+    method_option :app, :type => :string
 
     def config(remote)
-      Config.new(shell, remote, options).invoke
+      config = Config.new(shell, remote, options)
+      options[:pretend] ? config.pretend : config.invoke
     end
 
     desc 'deploy', 'Deploy to the given remote'

data/lib/travis/deploy/config.rb

@@ -4,6 +4,7 @@ require 'yaml'
 module Travis
   class Deploy
     class Config
+      autoload :Builder, 'travis/deploy/config/builder'
       include Helper
 
       attr_reader :shell, :remote, :env, :options
@@ -20,18 +21,23 @@ module Travis
         push
       end
 
+      def pretend
+        say 'Config to upload:'
+        say YAML.dump(config)
+      end
+
       protected
 
         def app
-          @app ||= begin
-            app = File.basename(Dir.pwd).gsub('travis-', '')
-            app = 'web' if app == 'ci'
-            app
-          end
+          @app ||= options[:app] || File.basename(Dir.pwd).gsub('travis-', '')
         end
 
         def config
-          @config ||= source || keychain.fetch
+          @config ||= source ? YAML.load(source) : Builder.new(keychain, env).build
+        end
+
+        def yaml_config
+          @yaml_config ||= source || keychain.source
         end
 
         def source
@@ -44,13 +50,13 @@ module Travis
 
         def store
           backup if backup?
-          File.open(filename, 'w+') { |f| f.write(config) }
+          File.open(filename, 'w+') { |f| f.write(yaml_config) }
         end
 
         def push
           say 'Configuring the app ...'
-          config = Shellwords.escape(YAML.dump(YAML.load(self.config)[env]))
-          run "heroku config:add travis_config=#{config} -r #{remote}", :echo => "heroku config:add travis_config=... -r #{remote}"
+          yaml = Shellwords.escape(YAML.dump(config))
+          run "heroku config:add travis_config=#{yaml} -r #{remote}", :echo => "heroku config:add travis_config=... -r #{remote}"
         end
 
         def backup

data/lib/travis/deploy/config/builder.rb

@@ -0,0 +1,33 @@
+class Travis::Deploy::Config
+  class Builder
+    attr_reader :config, :env, :keychain
+
+    def initialize(keychain, env)
+      @keychain = keychain
+      @config = YAML.load(keychain.source)
+      @env = env
+    end
+
+    def build
+      includes = []
+
+      includes << config.delete('includes') if config['includes']
+      includes << env_config.delete('includes') if env_config['includes']
+
+      includes.flatten!
+
+      result = env_config
+      includes.each do |name|
+        include_config = keychain.includes(name)
+        result.merge! include_config['all'] || {}
+        result.merge! include_config[env] || {}
+      end
+
+      result
+    end
+
+    def env_config
+      config.fetch env, {}
+    end
+  end
+end

data/lib/travis/keychain.rb

@@ -15,8 +15,31 @@ module Travis
       read
     end
 
+    def source
+      @source ||= fetch
+    end
+
+    def includes(name)
+      include_files[name]
+    end
+
     protected
 
+      def include_files
+        @include_files ||= begin
+          contents = {}
+
+          chdir do
+            Dir['config/includes/*.yml'].each do |path|
+              name = File.basename(path).sub(/\.yml$/, '')
+              contents[name] = YAML.load(File.read(path))
+            end
+          end
+
+          contents
+        end
+      end
+
       def pull
         error 'There are unstaged changes in your travis-keychain working directory.' unless clean?
         say 'Fetching the keychain ...'

data/spec/travis/deploy/config/builder_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+class Travis::Deploy::Config
+  describe Builder do
+    let(:env) { 'staging' }
+    let(:config) { "staging:\n  foo: bar" }
+    let(:keychain) { stub(:keychain, source: @config || config) }
+    let(:builder) { Builder.new(keychain, env) }
+
+    it 'loads config for given env' do
+      builder.build.should == { 'foo' => 'bar' }
+    end
+
+    it 'includes files specified at a top level' do
+      @config = YAML.dump 'includes' => ['pusher'], 'staging' => { 'foo' => 'bar' }
+      pusher_config = {
+        'all' => { 'bar' => 'baz', 'baz' => 'should be overwritten' },
+        'staging' => { 'baz' => 'qux' },
+        'development' => { 'no' => 'no' }
+      }
+      keychain.should_receive(:includes).with('pusher').and_return(pusher_config)
+
+      builder.build.should == { 'foo' => 'bar', 'bar' => 'baz', 'baz' => 'qux' }
+    end
+
+    it 'includes files specified for an env' do
+      @config = YAML.dump 'staging' => { 'foo' => 'bar', 'includes' => ['pusher'] },
+                          'production' => { 'includes' => ['encryption'] }
+
+      pusher_config = {
+        'all' => { 'bar' => 'baz', 'baz' => 'should be overwritten' },
+        'staging' => { 'baz' => 'qux' },
+        'development' => { 'no' => 'no' }
+      }
+      keychain.should_receive(:includes).with('pusher').and_return(pusher_config)
+
+      builder.build.should == { 'foo' => 'bar', 'bar' => 'baz', 'baz' => 'qux' }
+
+    end
+  end
+end

data/spec/travis/deploy/config_spec.rb

@@ -7,14 +7,14 @@ describe Travis::Deploy::Config do
   before :each do
     Travis::Deploy::Config.any_instance.stub(:clean? => true)
     Travis::Deploy::Config.any_instance.stub(:run)
-    Travis::Keychain.any_instance.stub(:fetch => config)
+    Travis::Keychain.any_instance.stub(:source => config)
     File.stub(:open)
   end
 
   describe 'sync' do
     it 'fetches the config from the keychain' do
       command = Travis::Deploy::Config.new(shell, 'staging', {})
-      command.send(:keychain).should_receive(:fetch).and_return(config)
+      command.send(:keychain).should_receive(:source).and_return(config)
       command.invoke
     end
 

data/travis-deploy.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = 'travis-deploy'
-  gem.version = '0.1.0'
+  gem.version = '0.2.0'
 
   gem.authors     = ['Travis Deploy Tool']
   gem.email       = ['contact@travis-ci.org']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -92,12 +92,14 @@ files:
 - bin/travis-deploy
 - lib/travis/deploy.rb
 - lib/travis/deploy/config.rb
+- lib/travis/deploy/config/builder.rb
 - lib/travis/deploy/deploy.rb
 - lib/travis/deploy/helper.rb
 - lib/travis/deploy/secure_key.rb
 - lib/travis/keychain.rb
 - lib/travis_cli.rb
 - spec/spec_helper.rb
+- spec/travis/deploy/config/builder_spec.rb
 - spec/travis/deploy/config_spec.rb
 - spec/travis/deploy/deploy_spec.rb
 - spec/travis/deploy/secure_key_spec.rb
@@ -123,14 +125,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A command-line interface to Travis CI
 test_files:
 - spec/spec_helper.rb
+- spec/travis/deploy/config/builder_spec.rb
 - spec/travis/deploy/config_spec.rb
 - spec/travis/deploy/deploy_spec.rb
 - spec/travis/deploy/secure_key_spec.rb
 - spec/travis/keychain_spec.rb
-has_rdoc: