ruby_yacht 0.5.0 → 0.6.0

data/spec/runner/command_spec.rb

@@ -52,9 +52,61 @@ describe RubyYacht::Runner::Command do
     end
     
     describe "get_machine_info" do
-      it "gets the property from docker" do
-        allow(subject).to receive(:backtick).with("docker-machine inspect default -f {{System.Name}}").and_return("Jimmy\n")
-        expect(subject.get_machine_info('System.Name')).to eq 'Jimmy'
+      before do
+        allow(subject).to receive(:backtick).with("/usr/local/bin/docker-machine inspect default -f {{System.Name}}").and_return("Jimmy\n")
+      end
+
+      context "with a docker machine" do
+        it "gets the property from docker" do
+          allow(subject).to receive(:docker_machine).and_return('/usr/local/bin/docker-machine')
+          expect(subject.get_machine_info('System.Name')).to eq 'Jimmy'
+        end
+      end
+
+      context "with no docker machine" do
+        it "returns an empty string" do
+          allow(subject).to receive(:docker_machine).and_return('')
+          expect(subject.get_machine_info('System.Name')).to eq ''
+        end
+      end
+    end
+
+    describe 'docker_machine' do
+      let(:docker_machine) { subject.docker_machine }
+
+      before do
+        RubyYacht.configuration.clear
+      end
+
+      context 'with docker-machine installed' do
+        before do
+          allow(subject).to receive(:backtick).with('which docker-machine').and_return("/usr/bin/docker-machine\n")
+        end
+
+        it 'is the path to docker-machine' do
+          expect(docker_machine).to eq '/usr/bin/docker-machine'
+        end
+      end
+
+      context 'with docker-machine not installed' do
+        before do
+          allow(subject).to receive(:backtick).with('which docker-machine').and_return('')
+        end
+
+        it 'is an empty string' do
+          expect(docker_machine).to eq ''
+        end
+      end
+
+      context 'with docker-machine disabled' do
+        before do
+          allow(subject).to receive(:backtick).with('which docker-machine').and_return('/usr/bin/docker-machine')
+          RubyYacht.configuration.disable_docker_machine = true
+        end
+
+        it 'is an empty string' do
+          expect(docker_machine).to eq ''
+        end
       end
     end
     

data/spec/runner/create_new_project_spec.rb

@@ -0,0 +1,93 @@
+require 'spec_helper'
+
+describe RubyYacht::Runner::CreateNewProject do
+  include DockerCommandSpec
+  
+  describe 'command information' do
+    specify { expect(described_class.command).to eq 'new' }
+    specify { expect(described_class.description).to eq 'Create a new ruby-yacht project' }
+    
+    describe 'command-line parsing' do
+      let(:options) { subject.option_parser }
+      
+      it 'gives a summary in the banner' do
+        expect(options.banner).to eq "Usage: rspec new [PROJECT] [DIRECTORY]\n\nCreate a new ruby-yacht project"
+      end
+
+      it 'takes the project and directory from the command line' do
+        subject.parse_positional_arguments(['apollo', 'apollo-config'])
+        expect(subject.project).to eq 'apollo'
+        expect(subject.directory).to eq 'apollo-config'
+      end
+    end
+  end
+  
+  describe "run behavior" do
+    before do
+      subject.project = 'apollo'
+      subject.directory = 'apollo-config'
+    end
+
+    after do
+      FileUtils.rm_rf('apollo-config')
+    end
+
+    it 'creates a project file' do
+      subject.run
+      path = './apollo-config/run.rb'
+      expect(File.exist?(path)).to be_truthy
+      contents = File.read(path)
+      expected = File.read('spec/fixtures/apollo-new-project-config')
+      expect(contents).to eq expected
+    end
+
+    it 'logs a message about the results' do
+      subject.run
+      expect(@log_entries).to eq [
+        'Your project has been created in apollo-config/run.rb.',
+        'You can go to apollo-config and run `ruby run.rb build` to create your docker containers.',
+        'Your initial app will be created in the apollo directory.'
+      ]
+    end
+
+    it "returns true" do
+      expect(subject.run).to be_truthy
+    end
+    
+    context 'with no project' do
+      before do
+        subject.project = nil
+      end
+
+      it 'logs an error' do
+        subject.run
+        expect(@log_entries).to eq [
+          'You must provide a project',
+          'Run rspec help new for more information'
+        ]
+      end
+      
+      it 'returns false' do
+        expect(subject.run).to be_falsey
+      end
+    end
+    
+    context 'with no directory' do
+      before do
+        subject.directory = nil
+      end
+      
+      it 'logs an error' do
+        subject.run
+        expect(@log_entries).to eq [
+          'You must provide a directory',
+          'Run rspec help new for more information'
+        ]
+      end
+      
+      it 'returns false' do
+        expect(subject.run).to be_falsey
+      end
+    end
+  end
+end

data/spec/runner/help_spec.rb

@@ -23,11 +23,15 @@ describe RubyYacht::Runner::Help do
   end
   
   describe "run behavior" do
+    before do
+      RubyYacht::Runner.load_default_commands
+    end
+    
     context "with no command" do
       it "prints the available commands" do
         subject.run
         expected = ["Available commands: \n\n"]
-        expected += RubyYacht::Runner.commands.map { |c| "#{c.name}: #{c.description}" }
+        expected += RubyYacht::Runner.commands.map { |c| "#{c.command}: #{c.description}" }
         expected << "\nRun rspec help [command] for more information on a command"
         expect(@log_entries).to eq expected
       end

data/spec/runner/run_containers_spec.rb

@@ -17,7 +17,7 @@ describe RubyYacht::Runner::RunContainers do
       docker.fail_unexpected_commands!
       docker.expect 'run -d --net=apollo --net-alias=apollo-mars --name=apollo-mars apollo-mars'
       docker.expect 'run -d --net=apollo --net-alias=apollo-saturn --name=apollo-saturn apollo-saturn'
-      docker.expect 'run -d -p 80:80 --net=apollo --net-alias=apollo-web --name=apollo-web apollo-web'
+      docker.expect 'run -d -p 80:80 --net=apollo --net-alias=apollo-nginx --name=apollo-nginx apollo-nginx'
       subject.run
     end
     
@@ -25,7 +25,7 @@ describe RubyYacht::Runner::RunContainers do
       subject.run
       expect(subject).to have_received(:remove_container).with('apollo-mars')
       expect(subject).to have_received(:remove_container).with('apollo-saturn')
-      expect(subject).to have_received(:remove_container).with('apollo-web')
+      expect(subject).to have_received(:remove_container).with('apollo-nginx')
     end
     
     it "returns true" do
@@ -58,13 +58,14 @@ describe RubyYacht::Runner::RunContainers do
       end
       
       it "runs the containers for both projects" do
-      docker.fail_unexpected_commands!
-      docker.expect 'run -d --net=apollo --net-alias=apollo-mars --name=apollo-mars apollo-mars'
-      docker.expect 'run -d --net=apollo --net-alias=apollo-saturn --name=apollo-saturn apollo-saturn'
-      docker.expect 'run -d --net=apollo --net-alias=jupiter-venus --name=jupiter-venus jupiter-venus'
-      docker.expect 'run -d --net=apollo --net-alias=jupiter-saturn --name=jupiter-saturn jupiter-saturn'
-      docker.expect 'run -d -p 80:80 --net=apollo --net-alias=apollo-web --name=apollo-web apollo-web'
-      subject.run
+        docker.fail_unexpected_commands!
+        docker.expect 'run -d --net=apollo --net-alias=apollo-mars --name=apollo-mars apollo-mars'
+        docker.expect 'run -d --net=apollo --net-alias=apollo-saturn --name=apollo-saturn apollo-saturn'
+        docker.expect 'run -d -p 80:80 --net=apollo --net-alias=apollo-nginx --name=apollo-nginx apollo-nginx'
+        docker.expect 'run -d --net=apollo --net-alias=jupiter-venus --name=jupiter-venus jupiter-venus'
+        docker.expect 'run -d --net=apollo --net-alias=jupiter-saturn --name=jupiter-saturn jupiter-saturn'
+        docker.expect 'run -d -p 80:80 --net=apollo --net-alias=jupiter-web --name=jupiter-web jupiter-web'
+        subject.run
       end
     
       it "returns true" do
@@ -115,7 +116,18 @@ describe RubyYacht::Runner::RunContainers do
         docker.fail_unexpected_commands!
         docker.expect 'run -d --net=apollo --net-alias=apollo --name=apollo apollo'
         docker.expect 'run -d --net=apollo --net-alias=apollo-saturn --name=apollo-saturn apollo-saturn'
-        docker.expect 'run -d -p 80:80 --net=apollo --net-alias=apollo-web --name=apollo-web apollo-web'
+        docker.expect 'run -d -p 80:80 --net=apollo --net-alias=apollo-nginx --name=apollo-nginx apollo-nginx'
+        subject.run
+      end
+    end
+
+    context 'with a special port for the web server' do
+      before do
+        RubyYacht.configuration.projects.first.web_servers.first.port = 3000
+      end
+
+      it 'maps the specified port on the host to port 80 in the container' do
+        docker.expect 'run -d -p 3000:80 --net=apollo --net-alias=apollo-nginx --name=apollo-nginx apollo-nginx'
         subject.run
       end
     end

data/spec/runner/runner_spec.rb

@@ -6,10 +6,37 @@ describe RubyYacht::Runner do
     allow(described_class).to receive(:exit)
   end
   
-  describe "commands" do
-    it "contains all the defined commands" do
-      commands = ObjectSpace.each_object(Class).select { |klass| klass < RubyYacht::Runner::Command && klass.inspect =~ /^RubyYacht::Runner/ }.uniq
-      expect(described_class.commands.sort_by(&:name)).to eq commands.sort_by(&:name)
+  describe "load_default_commands" do
+    before do
+      RubyYacht::Runner.clear_commands
+    end
+
+    after do
+      RubyYacht::Runner.clear_commands
+    end
+
+    context 'with the in_project flag set to true' do
+      before do
+        RubyYacht::Runner.load_default_commands(true)
+      end
+
+      it 'contains all the defined commands' do
+        classes = %w(Help Build BuildImages RunContainers Services Checkout Shell UpdateHosts Implode)
+        classes = classes.map { |klass| "RubyYacht::Runner::#{klass}" }
+        expect(described_class.commands.map(&:name)).to eq classes
+      end
+    end
+
+    context 'with the in_project flag set to false' do
+      before do
+        RubyYacht::Runner.load_default_commands(false)
+      end
+
+      it 'contains all the defined commands' do
+        classes = %w(Help CreateNewProject)
+        classes = classes.map { |klass| "RubyYacht::Runner::#{klass}" }
+        expect(described_class.commands.map(&:name)).to eq classes
+      end
     end
   end
   

data/spec/runner/services_spec.rb

@@ -29,7 +29,7 @@ describe RubyYacht::Runner::Services do
       docker.fail_unexpected_commands!
       docker.expect 'stop apollo-mars'
       docker.expect 'stop apollo-saturn'
-      docker.expect 'stop apollo-web'
+      docker.expect 'stop apollo-nginx'
       subject.run
     end
     
@@ -59,8 +59,8 @@ describe RubyYacht::Runner::Services do
     
     context "with a docker machine" do
       before do
-        allow(subject).to receive(:backtick).with('which docker-machine').and_return '/usr/bin/docker-machine'
-        allow(subject).to receive(:backtick).with('docker-machine env default').and_return "# Test\nexport TEST_VAL=\"123\""
+        allow(subject).to receive(:docker_machine).and_return '/usr/bin/docker-machine'
+        allow(subject).to receive(:backtick).with('/usr/bin/docker-machine env default').and_return "# Test\nexport TEST_VAL=\"123\""
         ENV.delete('TEST_VAL')
       end
       
@@ -75,7 +75,7 @@ describe RubyYacht::Runner::Services do
         
         it "starts the docker machine" do
           subject.run
-          expect(@system_commands).to eq ['docker-machine start default']
+          expect(@system_commands).to eq ['/usr/bin/docker-machine start default']
           expect(ENV['TEST_VAL']).to eq '123'
         end
     
@@ -101,6 +101,34 @@ describe RubyYacht::Runner::Services do
       end
     end
     
+    context "with no docker machine" do
+      before do
+        allow(subject).to receive(:docker_machine).and_return ''
+        allow(subject).to receive(:backtick).with('docker-machine env default').and_return "# Test\nexport TEST_VAL=\"123\""
+        ENV.delete('TEST_VAL')
+      end
+      
+      after do
+        ENV.delete('TEST_VAL')
+      end
+      
+      context "with the start command" do
+        before do
+          subject.command = 'start'
+        end
+        
+        it "does not start the docker machine" do
+          subject.run
+          expect(@system_commands).to eq []
+          expect(ENV['TEST_VAL']).to be_nil
+        end
+    
+        it "returns true" do
+          expect(subject.run).to be_truthy
+        end
+      end
+    end
+    
     context "with no command" do
       before do
         subject.command = nil

data/spec/runner/update_hosts_spec.rb

@@ -59,8 +59,9 @@ describe RubyYacht::Runner::UpdateHosts do
     
     it "copies the hosts file to a backup, and the tmp hosts file to the hosts file" do
       timestamp = Time.now.utc.strftime('%Y%m%d%H%M%S')
+      allow(subject).to receive(:backtick).with('which sudo').and_return('/usr/bin/sudo')
       subject.run
-      expect(@system_commands).to eq ["sudo cp /etc/hosts /etc/hosts.#{timestamp}.backup", "sudo mv tmp/hosts /etc/hosts"]
+      expect(@system_commands).to eq ["/usr/bin/sudo cp /etc/hosts /etc/hosts.#{timestamp}.backup", "/usr/bin/sudo cat tmp/hosts > /etc/hosts"]
     end
     
     it "returns true" do

data/spec/spec_helper.rb

@@ -6,5 +6,20 @@ SimpleCov.start do
 end
 
 require 'ruby_yacht'
+require 'byebug'
+require 'timecop'
 
-Dir[File.join('.', 'spec', 'support', '**', '*.rb')].each { |f| require f }
+Dir[File.join('.', 'spec', 'support', '**', '*.rb')].each { |f| require f }
+
+unless File.exist?("~/.ssh/id_rsa")
+  system "touch ~/.ssh/id_rsa"
+end
+
+RSpec.configure do |config|
+  if ENV['PRESERVE_IMAGES'] != '1'
+    config.after :suite do
+      IntegrationHelpers.clear_docker_containers
+      IntegrationHelpers.clear_docker_images
+    end
+  end
+end

data/spec/support/integration_helpers.rb

@@ -0,0 +1,76 @@
+module IntegrationHelpers
+  def configure_project
+    IntegrationHelpers.clear_docker_containers
+    system "docker network rm apollo 1> /dev/null 2> /dev/null"
+  end
+
+  def run_command(command, environment: {}, capture_output: false)
+    full_command = "ruby spec/integration/run.rb #{command}"
+    environment.each do |key, value|
+      full_command = "#{key}=#{value} #{full_command}"
+    end
+    if capture_output
+      `#{full_command}`
+    else
+      system "#{full_command} 1> log/integration_stdout.txt 2> log/integration_stderr.txt"
+    end
+  end
+  
+  def run_command_in_docker(image, command)
+    `docker run --net=apollo --rm apollo-#{image} #{command}`
+  end
+
+  def wait_on_command_success(command)
+    Timeout::timeout(60) do
+      found = false
+      while !found
+        result = system "#{command} 1> /dev/null 2> /dev/null"
+        found ||= !result.nil?
+        break if found
+        sleep 0.1
+      end
+    end
+  end
+
+  def wait_on_command_result(command, matchers)
+    timeout = matchers.delete(:timeout) || 60
+    Timeout::timeout(timeout) do
+      found = false
+      while !found
+        result = `#{command} 2>&1`
+        found ||= matchers[:contains] && result.include?(matchers[:contains])
+        found ||= matchers[:does_not_contain] && !result.include?(matchers[:does_not_contain])
+        break if found
+        sleep 0.1
+      end
+    end
+  end
+
+  def restore_hosts_file
+    backup_path = Dir["/etc/hosts*.backup"].last
+    if backup_path == nil
+      raise "Missing backup file"
+    end
+    system "cat #{backup_path} > /etc/hosts"
+    system "rm #{backup_path}"
+  end
+  
+  def self.image_names
+    images = %w(rails-app-dependencies saturn mars database web).map { |n| "apollo-#{n}"}
+    images += %w(rails-app-dependencies saturn database web).map { |n| "jupiter-#{n}"}
+    images += %w(apollo)
+    images
+  end
+
+  def self.clear_docker_images
+    image_names.each { |name| system "docker rmi #{name} 1> /dev/null 2> /dev/null" }
+  end
+  
+  def self.clear_docker_containers
+    image_names.each { |name| system "docker rm -f #{name} 1> /dev/null 2> /dev/null" }
+  end
+  
+  def self.clear_checkout_folders
+    `docker run --rm -v $PWD/..:/var/code ruby:2.3 bash -c 'rm -r /var/code/mars; rm -r /var/code/saturn'`
+  end
+end

data/spec/support/test_project.rb

@@ -10,11 +10,17 @@ module RubyYacht
         container_type :app
         baseline_image 'debian'
       end
+
+      server_type :nginx do
+        container_type :web
+        baseline_image 'ubuntu'
+      end
     end
 
     RubyYacht.configure do
       during :startup do
-        server_type :generic
+        app_server_type :generic
+        container_type :app
         command '/var/docker/start_app.bash'
       end
     end
@@ -26,7 +32,6 @@ module RubyYacht
     RubyYacht.configure do
       project :apollo do
         system_prefix :apollo
-        domain "apollo.test.com"
         repository "github.com"
         
         generic_app :mars do
@@ -36,6 +41,10 @@ module RubyYacht
         debian_app :saturn do
           repository_name 'brownleej/saturn'
         end
+
+        nginx_web_server :nginx do
+          domain 'apollo.test.com'
+        end
       end
     end
   end
@@ -44,7 +53,6 @@ module RubyYacht
     RubyYacht.configure do
       project :jupiter do
         system_prefix :jupiter
-        domain "jupiter.test.com"
         repository "github.com"
         
         debian_app :venus do
@@ -54,6 +62,10 @@ module RubyYacht
         debian_app :saturn do
           repository_name 'brownleej/saturn'
         end
+
+        nginx_web_server do
+          domain 'jupiter.test.com'
+        end
       end
     end
   end