foreplay 0.1.5 → 0.1.6

data/lib/foreplay/setup.rb

@@ -1,33 +1,33 @@
-require 'thor/group'
-
-module Foreplay
-  class Setup < Thor::Group
-    include Thor::Actions
-
-    class_option :name,         :aliases => '-n', :default => File.basename(Dir.getwd)
-    class_option :repository,   :aliases => '-r'
-    class_option :user,         :aliases => '-u'
-    class_option :password
-    class_option :keyfile
-    class_option :private_key,  :aliases => '-k'
-    class_option :port,         :aliases => '-p', :default => 50000
-    class_option :path,         :aliases => '-f'
-    class_option :servers,      :aliases => '-s', :type => :array
-    class_option :db_adapter,   :aliases => '-a', :default => 'postgresql'
-    class_option :db_encoding,  :aliases => '-e', :default => 'utf8'
-    class_option :db_pool,                        :default => 5
-    class_option :db_name,      :aliases => '-d'
-    class_option :db_host,      :aliases => '-h'
-    class_option :db_user
-    class_option :db_password
-    class_option :resque_redis
-
-    def self.source_root
-      File.dirname(__FILE__)
-    end
-
-    def config
-      template('setup/foreplay.yml', 'config/foreplay.yml')
-    end
-  end
-end
+require 'thor/group'
+
+module Foreplay
+  class Setup < Thor::Group
+    include Thor::Actions
+
+    class_option :name,         aliases: '-n', default: File.basename(Dir.getwd)
+    class_option :repository,   aliases: '-r'
+    class_option :user,         aliases: '-u'
+    class_option :password
+    class_option :keyfile
+    class_option :private_key,  aliases: '-k'
+    class_option :port,         aliases: '-p', default: 50_000
+    class_option :path,         aliases: '-f'
+    class_option :servers,      aliases: '-s', type: :array
+    class_option :db_adapter,   aliases: '-a', default: 'postgresql'
+    class_option :db_encoding,  aliases: '-e', default: 'utf8'
+    class_option :db_pool,                        default: 5
+    class_option :db_name,      aliases: '-d'
+    class_option :db_host,      aliases: '-h'
+    class_option :db_user
+    class_option :db_password
+    class_option :resque_redis
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
+    def config
+      template('setup/foreplay.yml', 'config/foreplay.yml')
+    end
+  end
+end

data/lib/foreplay/utility.rb

@@ -7,15 +7,15 @@ module Foreplay
     #   h1.supermerge(h2)
     #   #=> {:x=>{:y=>[4, 5, 6, 7, 8, 9]}, :z=>[7, 8, 9, "xyz"]}
     def self.supermerge(hash, other_hash)
-      raise 'supermerge only works if you pass two hashes' unless hash.is_a?(Hash) && other_hash.is_a?(Hash)
+      fail 'supermerge only works if you pass two hashes' unless hash.is_a?(Hash) && other_hash.is_a?(Hash)
 
       new_hash = hash.deep_dup.with_indifferent_access
 
-      other_hash.each_pair do |k,v|
+      other_hash.each_pair do |k, v|
         tv = new_hash[k]
 
         if tv.is_a?(Hash) && v.is_a?(Hash)
-          new_hash[k] = Foreplay::Utility::supermerge(tv, v)
+          new_hash[k] = Foreplay::Utility.supermerge(tv, v)
         elsif tv.is_a?(Array) || v.is_a?(Array)
           new_hash[k] = Array.wrap(tv) + Array.wrap(v)
         else

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = "0.1.5"
+  VERSION = '0.1.6'
 end

data/spec/lib/foreplay/deploy_spec.rb

@@ -1,122 +1,130 @@
-require 'spec_helper'
-require 'foreplay'
-require 'net/ssh/shell'
-
-describe Foreplay::Deploy do
-  let (:ssh)      { double(Net::SSH) }
-  let (:session)  { double(Net::SSH::Connection::Session) }
-  let (:shell)    { double(Net::SSH::Shell) }
-  let (:process)  { double(Net::SSH::Shell::Process) }
-
-  before :each do
-    # Setup foreplay
-    `rm -f config/foreplay.yml`
-    `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred --password trollope`
-
-    # Stub all the things
-    Net::SSH.stub(:start).and_yield(session)
-    session.stub(:shell).and_yield(shell)
-    shell.stub(:execute).and_return(process)
-    shell.stub(:wait!).and_return(false)
-    process.stub(:on_output).and_yield(process, "output message\n")
-    process.stub(:exit_status).and_return(0)
-  end
-
-  it "should complain on check if there's no config file" do
-    `rm -f config/foreplay.yml`
-    expect { Foreplay::Deploy.start([:check, 'production', '']) }.to raise_error(RuntimeError, /.*Please run foreplay setup or create the file manually.*/)
-  end
-
-  it "should complain on deploy if there's no config file" do
-    `rm -f config/foreplay.yml`
-    expect { Foreplay::Deploy.start([:deploy, 'production', '']) }.to raise_error(RuntimeError, /.*Please run foreplay setup or create the file manually.*/)
-  end
-
-  it "should complain if there are no authentication methods defined in the config file" do
-    `rm -f config/foreplay.yml`
-    `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred --password ""`
-    expect { Foreplay::Deploy.start([:deploy, 'production', '']) }.to raise_error(RuntimeError, /.*No authentication methods supplied. You must supply a private key, key file or password in the configuration file*/)
-  end
-
-  it "should complain if the private keyfile defined in the config file doesn't exist" do
-    `rm -f config/foreplay.yml`
-    `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred --keyfile "/home/fred/no-such-file"`
-    expect { Foreplay::Deploy.start([:deploy, 'production', '']) }.to raise_error(Errno::ENOENT, /.*No such file or directory @ rb_sysopen - \/home\/fred\/no-such-file*/)
-  end
-
-  it "should terminate if a remote process exits with a non-zero status" do
-    process.stub(:exit_status).and_return(1)
-    expect { Foreplay::Deploy.start([:deploy, 'production', '']) }.to raise_error(RuntimeError, /.*output message*/)
-  end
-
-  it "should terminate if a connection can't be established with the remote server" do
-    Net::SSH.unstub(:start)
-    expect { Foreplay::Deploy.start([:deploy, 'production', '']) }.to raise_error(RuntimeError, /.*There was a problem starting an ssh session on web.example.com*/)
-  end
-
-  it "should check the config" do
-    $stdout.should_receive(:puts).at_least(:once)
-    Foreplay::Deploy.start [:check, 'production', '']
-  end
-
-  it "should deploy to the environment" do
-    Net::SSH.should_receive(:start).with('web.example.com', 'fred', { :verbose => :warn, :port => 22, :password => 'trollope' }).and_yield(session)
-
-    [
-      'mkdir -p apps/foreplay && cd apps/foreplay && rm -rf 50000 && git clone git@github.com:Xenapto/foreplay.git 50000',
-      'rvm rvmrc trust 50000',
-      'rvm rvmrc warning ignore 50000',
-      'cd 50000',
-      'if [ -f .ruby-version ] ; then rvm install `cat .ruby-version` ; else echo "No .ruby-version file found" ; fi',
-      'mkdir -p config',
-      'echo "RAILS_ENV=production" > .env',
-      'echo "concurrency: web=1,worker=0,scheduler=0" > .foreman',
-      'echo "app: foreplay-50000" >> .foreman',
-      'echo "port: 50000" >> .foreman',
-      'echo "user: fred" >> .foreman',
-      'echo "production:" > config/database.yml',
-      'echo "  adapter: postgresql" >> config/database.yml',
-      'echo "  encoding: utf8" >> config/database.yml',
-      'echo "  database: TODO Put the database name here" >> config/database.yml',
-      'echo "  pool: 5" >> config/database.yml',
-      'echo "  host: TODO Put here the database host name" >> config/database.yml',
-      'echo "  username: TODO Put here the database user" >> config/database.yml',
-      'echo "  password: TODO Put here the database user\'s password" >> config/database.yml',
-      'bundle install --deployment --without development test',
-      'sudo ln -f `which foreman` /usr/bin/foreman || echo Using default version of foreman',
-      'sudo foreman export upstart /etc/init',
-      'sudo start foreplay-50000 || sudo restart foreplay-50000',
-      'mkdir -p .foreplay/foreplay && touch .foreplay/foreplay/current_port && cat .foreplay/foreplay/current_port',
-      'echo 50000 > .foreplay/foreplay/current_port',
-      'sleep 60',
-      'sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 50000',
-      'sudo iptables -t nat -D PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 51000',
-      'sudo iptables-save > /etc/iptables/rules.v4',
-      'sudo iptables-save > /etc/iptables.up.rules',
-      'sudo iptables-save -c | egrep REDIRECT --color=never',
-      'sudo stop foreplay-51000 || echo \'No previous instance running\''
-    ].each do |command|
-      shell.should_receive(:execute).with(command).and_return(process)
-    end
-
-    Foreplay::Deploy.start [:deploy, 'production', '']
-  end
-
-  it "should use another port if there's already an installed instance" do
-    process.stub(:on_output).and_yield(process, "50000\n")
-    shell.should_receive(:execute).with('echo 51000 > .foreplay/foreplay/current_port').and_return(process)
-    Foreplay::Deploy.start [:deploy, 'production', '']
-  end
-
-  it "should use the private key provided in the config file" do
-    `rm -f config/foreplay.yml`
-    `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred -k "top secret private key"`
-    Foreplay::Deploy.start([:deploy, 'production', ''])
-  end
-
-  it "should add Redis details for Resque" do
-    `rm -f config/foreplay.yml`
-    `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred --resque-redis "redis://localhost:6379"`
-    Foreplay::Deploy.start([:deploy, 'production', ''])
-  end
-end
+require 'spec_helper'
+require 'foreplay'
+require 'net/ssh/shell'
+
+describe Foreplay::Deploy do
+  let(:ssh)      { double(Net::SSH) }
+  let(:session)  { double(Net::SSH::Connection::Session) }
+  let(:shell)    { double(Net::SSH::Shell) }
+  let(:process)  { double(Net::SSH::Shell::Process) }
+
+  before :each do
+    # Setup foreplay
+    `rm -f config/foreplay.yml`
+    `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred --password trollope`
+
+    # Stub all the things
+    Net::SSH.stub(:start).and_yield(session)
+    session.stub(:shell).and_yield(shell)
+    shell.stub(:execute).and_return(process)
+    shell.stub(:wait!).and_return(false)
+    process.stub(:on_output).and_yield(process, "output message\n")
+    process.stub(:exit_status).and_return(0)
+  end
+
+  it "should complain on check if there's no config file" do
+    `rm -f config/foreplay.yml`
+    expect { Foreplay::Deploy.start([:check, 'production', '']) }
+      .to raise_error(RuntimeError, /.*Please run foreplay setup or create the file manually.*/)
+  end
+
+  it "should complain on deploy if there's no config file" do
+    `rm -f config/foreplay.yml`
+    expect { Foreplay::Deploy.start([:deploy, 'production', '']) }
+      .to raise_error(RuntimeError, /.*Please run foreplay setup or create the file manually.*/)
+  end
+
+  it 'should complain if there are no authentication methods defined in the config file' do
+    `rm -f config/foreplay.yml`
+    `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred --password ""`
+    expect { Foreplay::Deploy.start([:deploy, 'production', '']) }
+      .to raise_error(
+        RuntimeError,
+        /.*No authentication methods supplied. You must supply a private key, key file or password in the configuration file*/
+      )
+  end
+
+  it "should complain if the private keyfile defined in the config file doesn't exist" do
+    `rm -f config/foreplay.yml`
+    `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred --keyfile "/home/fred/no-such-file"`
+    expect { Foreplay::Deploy.start([:deploy, 'production', '']) }
+      .to raise_error(Errno::ENOENT, %r{.*No such file or directory @ rb_sysopen - /home/fred/no-such-file*})
+  end
+
+  it 'should terminate if a remote process exits with a non-zero status' do
+    process.stub(:exit_status).and_return(1)
+    expect { Foreplay::Deploy.start([:deploy, 'production', '']) }.to raise_error(RuntimeError, /.*output message*/)
+  end
+
+  it "should terminate if a connection can't be established with the remote server" do
+    Net::SSH.unstub(:start)
+    expect { Foreplay::Deploy.start([:deploy, 'production', '']) }
+      .to raise_error(RuntimeError, /.*There was a problem starting an ssh session on web.example.com*/)
+  end
+
+  it 'should check the config' do
+    $stdout.should_receive(:puts).at_least(:once)
+    Foreplay::Deploy.start [:check, 'production', '']
+  end
+
+  it 'should deploy to the environment' do
+    Net::SSH.should_receive(:start).with('web.example.com', 'fred',  verbose: :warn, port: 22, password: 'trollope').and_yield(session)
+
+    [
+      'mkdir -p apps/foreplay && cd apps/foreplay && rm -rf 50000 && git clone git@github.com:Xenapto/foreplay.git 50000',
+      'rvm rvmrc trust 50000',
+      'rvm rvmrc warning ignore 50000',
+      'cd 50000',
+      'if [ -f .ruby-version ] ; then rvm install `cat .ruby-version` ; else echo "No .ruby-version file found" ; fi',
+      'mkdir -p config',
+      'echo "RAILS_ENV=production" > .env',
+      'echo "concurrency: web=1,worker=0,scheduler=0" > .foreman',
+      'echo "app: foreplay-50000" >> .foreman',
+      'echo "port: 50000" >> .foreman',
+      'echo "user: fred" >> .foreman',
+      'echo "production:" > config/database.yml',
+      'echo "  adapter: postgresql" >> config/database.yml',
+      'echo "  encoding: utf8" >> config/database.yml',
+      'echo "  database: TODO Put the database name here" >> config/database.yml',
+      'echo "  pool: 5" >> config/database.yml',
+      'echo "  host: TODO Put here the database host name" >> config/database.yml',
+      'echo "  username: TODO Put here the database user" >> config/database.yml',
+      'echo "  password: TODO Put here the database user\'s password" >> config/database.yml',
+      'bundle install --deployment --without development test',
+      'sudo ln -f `which foreman` /usr/bin/foreman || echo Using default version of foreman',
+      'sudo foreman export upstart /etc/init',
+      'sudo start foreplay-50000 || sudo restart foreplay-50000',
+      'mkdir -p .foreplay/foreplay && touch .foreplay/foreplay/current_port && cat .foreplay/foreplay/current_port',
+      'echo 50000 > $HOME/.foreplay/foreplay/current_port',
+      'sleep 60',
+      'sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 50000',
+      'sudo iptables -t nat -D PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 51000',
+      'sudo iptables-save > /etc/iptables/rules.v4',
+      'sudo iptables-save > /etc/iptables.up.rules',
+      'sudo iptables-save -c | egrep REDIRECT --color=never',
+      'sudo stop foreplay-51000 || echo \'No previous instance running\''
+    ].each do |command|
+      shell.should_receive(:execute).with(command).and_return(process)
+    end
+
+    Foreplay::Deploy.start [:deploy, 'production', '']
+  end
+
+  it "should use another port if there's already an installed instance" do
+    process.stub(:on_output).and_yield(process, "50000\n")
+    shell.should_receive(:execute).with('echo 51000 > $HOME/.foreplay/foreplay/current_port').and_return(process)
+    Foreplay::Deploy.start [:deploy, 'production', '']
+  end
+
+  it 'should use the private key provided in the config file' do
+    `rm -f config/foreplay.yml`
+    `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred -k "top secret private key"`
+    Foreplay::Deploy.start([:deploy, 'production', ''])
+  end
+
+  it 'should add Redis details for Resque' do
+    `rm -f config/foreplay.yml`
+    `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred --resque-redis "redis://localhost:6379"`
+    Foreplay::Deploy.start([:deploy, 'production', ''])
+  end
+end

data/spec/lib/foreplay/setup_spec.rb

@@ -1,13 +1,13 @@
-require 'spec_helper'
-require 'foreplay'
-
-describe Foreplay::Setup do
-  before :each do
-    `rm -f config/foreplay.yml`
-  end
-
-  it "should create a config file" do
-    File.should_receive(:open)
-    Foreplay::Setup.start
-  end
-end
+require 'spec_helper'
+require 'foreplay'
+
+describe Foreplay::Setup do
+  before :each do
+    `rm -f config/foreplay.yml`
+  end
+
+  it 'should create a config file' do
+    File.should_receive(:open)
+    Foreplay::Setup.start
+  end
+end

data/spec/lib/foreplay/utility_spec.rb

@@ -1,28 +1,28 @@
-require 'spec_helper'
-require 'foreplay'
-
-describe Foreplay::Utility do
-  it "should complain unless two hashes are passed to it" do
-    expect { Foreplay::Utility::supermerge('x', 'y') }.to raise_error(RuntimeError)
-  end
-
-  it "should merge two simple hashes" do
-    expect(Foreplay::Utility::supermerge({ :a => 'x' }, { :b => 'y' })).to eq({ 'a' => 'x', 'b' => 'y' })
-  end
-
-  it "should merge two hashes both with arrays at the same key" do
-    expect(Foreplay::Utility::supermerge({ :a => ['x'] }, { :a => ['y'] })).to eq({ 'a' => ['x', 'y'] })
-  end
-
-  it "should merge an array and a value at the same key" do
-    expect(Foreplay::Utility::supermerge({ :a => 'x' }, { :a => ['y'] })).to eq({ 'a' => ['x', 'y'] })
-  end
-
-  it "should replace a value at the same key" do
-    expect(Foreplay::Utility::supermerge({ :a => 'x' }, { :a => 'y' })).to eq({ 'a' => 'y' })
-  end
-
-  it "should merge two subhashes at the same key" do
-    expect(Foreplay::Utility::supermerge({ :a => { :b => 'x' } }, { :a => { :c => 'y' } })).to eq({ 'a' => { 'b' => 'x', 'c' => 'y' } })
-  end
-end
+require 'spec_helper'
+require 'foreplay'
+
+describe Foreplay::Utility do
+  it 'should complain unless two hashes are passed to it' do
+    expect { Foreplay::Utility.supermerge('x', 'y') }.to raise_error(RuntimeError)
+  end
+
+  it 'should merge two simple hashes' do
+    expect(Foreplay::Utility.supermerge({ a: 'x' }, { b: 'y' })).to eq('a' => 'x', 'b' => 'y')
+  end
+
+  it 'should merge two hashes both with arrays at the same key' do
+    expect(Foreplay::Utility.supermerge({ a: ['x'] }, { a: ['y'] })).to eq('a' => %w(x y))
+  end
+
+  it 'should merge an array and a value at the same key' do
+    expect(Foreplay::Utility.supermerge({ a: 'x' }, { a: ['y'] })).to eq('a' => %w(x y))
+  end
+
+  it 'should replace a value at the same key' do
+    expect(Foreplay::Utility.supermerge({ a: 'x' }, { a: 'y' })).to eq('a' => 'y')
+  end
+
+  it 'should merge two subhashes at the same key' do
+    expect(Foreplay::Utility.supermerge({ a: { b: 'x' } }, { a: { c: 'y' } })).to eq('a' => { 'b' => 'x', 'c' => 'y' })
+  end
+end

data/spec/spec_helper.rb

@@ -5,11 +5,11 @@ SimpleCov.start
 Coveralls.wear!('rails') if ENV['COVERALLS_REPO_TOKEN']
 
 RSpec.configure do |config|
- # Run specs in random order to surface order dependencies. If you find an
+  # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = "random"
+  config.order = 'random'
 
   # Manually-added
   config.color_enabled = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport