foreplay 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a871af7ae274b786c2187f8ad0e350ffd7de0f5
-  data.tar.gz: 2be85bd0359759db0c8aceff3f35717c082b7e3d
+  metadata.gz: 97f18a0731191cf469fba1995ee53ecd33c2fbc2
+  data.tar.gz: b4bcb4397858d6d851eeac32b87efd65077e1c20
 SHA512:
-  metadata.gz: 2e3d7affb047792f2395255f826a6756648ee84495844156fecbb82161888dc1ab43f641c7fce07aeaa8d3521709bba573fc444e89cb5f88116e0bbcd6f18803
-  data.tar.gz: c033baf78141a6a16fdd757599459e89c7c04951d84f62aa7e4ff83414419e4ffe2f1ed9d4c0080b5ba21c8ed9f05beb27185c21c22f447f8906a616a6cd1cb8
+  metadata.gz: b02466199c0278fc600d582027ad50969ae558e6ba4cdc37508065fb4d11f0ff0ffeb62c27226f582629f85ef5dd4ea1f979721bfe793fa473353ac266e9d303
+  data.tar.gz: 83471c6f9631f3158a64e32fce3d82d1648a8341e7d1cd2aaa064ebbeb4380e566515509e2a5f3164946526aa6bdf38911de194bd5f1f8f35eb8e4c5cd61362a

data/lib/foreplay/deploy.rb

@@ -145,6 +145,11 @@ module Foreplay
       instructions[:foreman]['user']  = user
       instructions[:foreman]['log']   = "$HOME/#{path}/#{current_port}/log"
 
+      # Contents of .env file
+      instructions[:env]['HOME']  = '$HOME'
+      instructions[:env]['SHELL'] = '$SHELL'
+      instructions[:env]['PATH']  = '$PATH:`which bundle`'
+
       # Commands to execute on remote server
       steps = [
         {  command:      "mkdir -p #{path} && cd #{path} && rm -rf #{current_port} && git clone #{repository} #{current_port}",
@@ -153,7 +158,7 @@ module Foreplay
            commentary:   'Trusting the .rvmrc file for the new instance' },
         {  command:      "rvm rvmrc warning ignore #{current_port}",
            commentary:   'Ignoring the .rvmrc warning for the new instance' },
-        {  command:      "cd #{current_port}",
+        {  command:      "cd #{current_port} && mkdir -p log",
            commentary:   'If you have a .rvmrc file there may be a delay now while we install a new ruby' },
         {  command:      'if [ -f .ruby-version ] ; then rvm install `cat .ruby-version` ; else echo "No .ruby-version file found" ; fi',
            commentary:   'If you have a .ruby-version file there may be a delay now while we install a new ruby' },
@@ -184,12 +189,6 @@ module Foreplay
            commentary:   'Using bundler to install the required gems in deployment mode' },
         {  command:      'sudo ln -f `which foreman` /usr/bin/foreman || echo Using default version of foreman',
            commentary:   'Setting the current version of foreman to be the default' },
-        {  command:      'echo HOME="$HOME" >> .env',
-           commentary:   'Adding home path to .env (foreplay issue #443)' },
-        {  command:      'echo SHELL="$SHELL" >> .env',
-           commentary:   'Adding shell path to .env (foreplay issue #443)' },
-        {  command:      'echo PATH="$PATH:`which bundle`" >> .env',
-           commentary:   'Adding bundler path to .env (foreplay issue #443)' },
         {  command:      'sudo foreman export upstart /etc/init',
            commentary:   "Converting #{current_service} to an upstart service" },
         {  command:      "sudo start #{current_service} || sudo restart #{current_service}",

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/lib/foreplay/deploy_spec.rb

@@ -11,7 +11,7 @@ describe Foreplay::Deploy do
   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`
+    `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web1.example.com web2.example.com -f apps/%a -u fred --password trollope`
 
     # Stub all the things
     Net::SSH.stub(:start).and_yield(session)
@@ -40,7 +40,7 @@ describe Foreplay::Deploy do
     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*/
+        /.*No authentication methods supplied. You must supply a private key, key file or password in the configuration file.*/
       )
   end
 
@@ -48,18 +48,36 @@ describe Foreplay::Deploy 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*})
+      .to raise_error(Errno::ENOENT, %r{.*No such file or directory @ rb_sysopen - /home/fred/no-such-file.*})
+  end
+
+  it 'complains if a mandatory key is missing from the config file' do
+    `sed -i 's/path:/pxth:/' config/foreplay.yml`
+
+    expect { Foreplay::Deploy.start([:deploy, 'production', '']) }
+      .to raise_error(
+        RuntimeError,
+        /.*Required key path not found in instructions for production environment.*/
+      )
+  end
+
+  it 'complains if we try to deploy an environment that isn\'t defined' do
+    expect { Foreplay::Deploy.start([:deploy, 'unknown', '']) }
+      .to raise_error(
+        RuntimeError,
+        /.*No deployment configuration defined for unknown environment.*/
+      )
   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*/)
+    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*/)
+      .to raise_error(RuntimeError, /.*There was a problem starting an ssh session on web1.example.com.*/)
   end
 
   it 'should check the config' do
@@ -68,13 +86,13 @@ describe Foreplay::Deploy do
   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)
+    Net::SSH.should_receive(:start).with('web1.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',
+      'cd 50000 && mkdir -p log',
       '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',

metadata

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