boxci 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a475fe47696c8556909205cd4298df0c1daff83f
-  data.tar.gz: c13165f012d2e9baeace5c45c4fc6ff8d4432df5
+  metadata.gz: 961796b04b8beab12bf98867cd6d0fa1a370c18c
+  data.tar.gz: 56c6d1acaddbc9fe4ba1282147254aa0ab2ebcc9
 SHA512:
-  metadata.gz: d95af11773c6c3c0f56a663d976b8b708e62f17fcf31f408ddc6058e9274aaa3031e6a7bcdbcf614eaa85a2f6fb0372518e5afd54bb177b982bb47d53efc37fb
-  data.tar.gz: a3ed46d45eb0bfa6f2d6d1bad7716611bd5bc3d520bd893f23174d2395a4c74d0449f2b026ceda0544058a0af0edc192bf65bba88d9b7914d76046efd2bc5b65
+  metadata.gz: fb2739530a44a7e99c8744b12443a3f5462427c58ce47dfb52e91f2b19c738f959ffd2787c05940a8aa501967de9ecc249a77f53a74914efee38f1ad4edc7c3c
+  data.tar.gz: 84a558ec5653a00f1c95d0c580498fc32aa42d359a5c0916ce44a87adba07e2d9b5b3faf451d2710a3c21414d16af638679ecb0a05e6e2f690b79bdd64894179

data/.coveralls.yml

@@ -0,0 +1 @@
+repo_token: fvHQttEYW81Y4vsXIifjgdoW0wjmHA2Ks

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "1.9.2"
+  - "1.9.3"
+  - "2.0.0"
+  - "2.1.0"
+  - "2.1.1"
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/CHANGELOG.md

@@ -6,6 +6,17 @@ versions as well as provide a rough history.
 
 #### Next Release
 
+- Fix issue #31 so that it auto installs vagrant plugins without prompting the
+  user. This will allow it to work in non-interactive environments like other
+  CI systems (Bamboo, etc.)
+- Fix issue #30 where exceptions were being swallowed and forcing an exit
+  status 0 instead of displaying the exception and exiting non-zero.
+- Added exporting of `BOXCI_TEST_RESULT` with the value being the exit code of
+  the bulid. This allows it to be inspected in the `after_failure`,
+  `after_success`, or `after_script` commands.
+- Made `after_success`, `after_failure`, and `after_script` no longer affect
+  the `boxci test` exit code.
+
 #### v0.0.30
 
 - Renamed project from `shanty` to `boxci`

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in shanty.gemspec
 gemspec
+
+group :test do
+  gem 'coveralls', :require => false
+end

data/README.md

@@ -1,9 +1,15 @@
 # boxci: standardizing virtual development & ci environments
 
+[![Build Status](https://travis-ci.org/reachlocal/boxci.svg?branch=master)](https://travis-ci.org/reachlocal/boxci)
+[![Version](https://img.shields.io/gem/v/boxci.svg)](https://rubygems.org/gems/boxci)
+[![Code Climate](https://img.shields.io/codeclimate/github/reachlocal/boxci.svg)](https://codeclimate.com/github/reachlocal/boxci)
+[![Code Coverage](http://img.shields.io/coveralls/reachlocal/boxci.svg)](https://coveralls.io/r/reachlocal/boxci)
+[![Dependency Status](https://gemnasium.com/reachlocal/boxci.svg)](https://gemnasium.com/reachlocal/boxci)
+
 Boxci makes creating a virtualized development & continuous integration
 environments as easy as possible.
 
-It does this by focusing on implementing standards around the use of 
+It does this by focusing on implementing standards around the use of
 [Vagrant](http://www.vagrantup.com/) for managing your development
 and continuous integration environment. This means that it helps you
 configure and setup [Vagrant](http://www.vagrantup.com/), generate a well
@@ -34,7 +40,7 @@ To *boxcify* your project you need to run the `boxci init <language>` command.
 This command will create an initial `.boxci.yml` config for you in the current
 working directory. Therefore, you should run this command from the root of
 your project. It will also handle creating your user level `boxci`
-configurations in the `~/.boxci` direcotry. An example of this can be seen as
+configurations in the `~/.boxci` directory. An example of this can be seen as
 follows:
 
     $ boxci init ruby
@@ -46,7 +52,7 @@ following is an example:
 
     $ boxci init -p openstack ruby
 
-This will go through and setup the proper directory stucture and create the
+This will go through and setup the proper directory structure and create the
 config files just as before. However, when it identifies conflicts with the
 existing files it will prompt you and ask you if you want to overwrite, diff
 the files, not overwrite, etc.

data/Rakefile

@@ -1,4 +1,7 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
 
 # Add a simple console for debugging.
 #
@@ -10,4 +13,6 @@ task :console do
   require 'shanty'
   ARGV.clear
   IRB.start
-end
+end
+
+task :default => :spec

data/boxci.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["cyphactor@gmail.com", "brimil01@gmail.com", "russcloak@gmail.cm"]
   spec.summary       = %q{Tool simplifying Vagrant based development & continuous integration environments.}
   spec.description   = %q{Boxci is focused on defining standards and building tooling around using Vagrant for development & continuous integration environments to make using them as easy as possible.}
-  spec.homepage      = "http://github.com/reachlocal/boxci"
+  spec.homepage      = "http://boxci.io"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/boxci/providers/aws.rb

@@ -2,8 +2,8 @@ module Boxci
   module Providers
     class Aws < ::Boxci::Provider
       PLUGIN = {
-        name: "vagrant-aws",
-        dummy_box_url: "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"
+        :name => "vagrant-aws",
+        :dummy_box_url => "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"
       }
 
       no_commands do

data/lib/boxci/providers/openstack.rb

@@ -2,8 +2,8 @@ module Boxci
   module Providers
     class Openstack < ::Boxci::Provider
       PLUGIN = {
-        name: "vagrant-openstack-plugin",
-        dummy_box_url: "https://github.com/cloudbau/vagrant-openstack-plugin/raw/master/dummy.box"
+        :name => "vagrant-openstack-plugin",
+        :dummy_box_url => "https://github.com/cloudbau/vagrant-openstack-plugin/raw/master/dummy.box"
       }
 
       no_commands do

data/lib/boxci/test_runner.rb

@@ -7,7 +7,7 @@ module Boxci
     def generate_script
       snippets = []
       snippets << %q{#!/bin/bash --login}
-      snippets << %q{test_runner_exit_status=0}
+      snippets << %q{BOXCI_TEST_RESULT=0}
       snippets << <<SNIPPET
 PROJECT_DIR="/vagrant/project"
 mkdir $PROJECT_DIR
@@ -28,18 +28,20 @@ SNIPPET
 
           snippets << generate_short_circuiting_hook_script('before_script')
           snippets << generate_script_hook_script
+          snippets << %q{export BOXCI_TEST_RESULT=$BOXCI_TEST_RESULT}
           snippets << generate_after_success_and_failure_hook_script
-          snippets << generate_continuing_hook_script('after_script')
+          snippets << generate_continue_and_ignore_hook_script('after_script')
         end
       else
         snippets << short_circuit_on_step_failure('after_permutation_switch', @language.after_permutation_switch)
 
         snippets << generate_short_circuiting_hook_script('before_script')
         snippets << generate_script_hook_script
+        snippets << %q{export BOXCI_TEST_RESULT=$BOXCI_TEST_RESULT}
         snippets << generate_after_success_and_failure_hook_script
-        snippets << generate_continuing_hook_script('after_script')
+        snippets << generate_continue_and_ignore_hook_script('after_script')
       end
-      snippets << %{exit $test_runner_exit_status}
+      snippets << %{exit $BOXCI_TEST_RESULT}
       return snippets.join("\n")
     end
 
@@ -47,12 +49,12 @@ SNIPPET
 
     def generate_after_success_and_failure_hook_script
       <<SNIPPET
-if [ $test_runner_exit_status -eq 0 ]; then
+if [ $BOXCI_TEST_RESULT -eq 0 ]; then
 :
-#{generate_continuing_hook_script('after_success')}
+#{generate_continue_and_ignore_hook_script('after_success')}
 else
 :
-#{generate_continuing_hook_script('after_failure')}
+#{generate_continue_and_ignore_hook_script('after_failure')}
 fi
 SNIPPET
     end
@@ -69,11 +71,11 @@ SNIPPET
       end
     end
 
-    def generate_continuing_hook_script(hook_name)
+    def generate_continue_and_ignore_hook_script(hook_name)
       if !Boxci.project_config.send(hook_name.to_sym).empty?
         snippets = []
         Boxci.project_config.send(hook_name.to_sym).each do |step|
-          snippets << continue_on_step_failure(hook_name, step)
+          snippets << continue_and_ignore_on_step_failure(hook_name, step)
         end
         return snippets.join("\n")
       else
@@ -121,8 +123,26 @@ step_exit_code=0
 #{step}
 step_exit_code=$?
 if [ $step_exit_code -ne 0 ]; then
-  echo "Warning: script step '#{step}' exited with non-zero exit code ($step_exit_code)."
-  test_runner_exit_status=1
+  echo "Warning: #{hook_name} step '#{step}' exited with non-zero exit code ($step_exit_code)."
+  BOXCI_TEST_RESULT=1
+fi
+# End of '#{hook_name}' step '#{step}'
+SNIPPET
+      else
+        %Q(# Placeholder where '#{hook_name}' would go if it was set.)
+      end
+    end
+
+    def continue_and_ignore_on_step_failure(hook_name, step)
+      if step && !step.empty?
+        <<SNIPPET
+# Beginning of '#{hook_name}' step '#{step}'
+echo "Running '#{hook_name}' step '#{step}'"
+step_exit_code=0
+#{step}
+step_exit_code=$?
+if [ $step_exit_code -ne 0 ]; then
+  echo "Warning: #{hook_name} step '#{step}' exited with non-zero exit code ($step_exit_code)."
 fi
 # End of '#{hook_name}' step '#{step}'
 SNIPPET

data/lib/boxci/tester.rb

@@ -7,10 +7,6 @@ module Boxci
     include Thor::Base
     include Thor::Actions
 
-    def self.exit_on_failure?
-      true
-    end
-
     source_root(File.dirname(__FILE__))
 
     def test(options)
@@ -57,42 +53,37 @@ module Boxci
       # verify.
       Signal.trap('SIGPIPE', 'SIG_IGN')
 
-      @tester_exit_code = 0
-      # depencency_checker = Boxci::DependencyChecker.new
-      # depencency_checker.verify_all
-      initial_config(options)
-
-      create_project_folder
-      create_project_archive
-      write_vagrant_file
-      write_test_runner
-      if @provider_object.requires_plugin?
-        install_vagrant_plugin
-        add_provider_box
-      end
-      spin_up_box
-      setup_ssh_config
-      install_puppet_on_box
-      provision_box
-      create_artifact_directory
-      upload_test_runner
-      run_tests
-      download_artifacts
-      say "Finished!", :green
-    rescue Errno::EPIPE => e
-      File.open('/tmp/boxci.log', 'a+') do |f|
-        f.write("test() method swallowed Errno::EPIPE exception\n")
-      end
-    rescue => e
-      File.open('/tmp/boxci.log', 'a+') do |f|
-        f.write("test() method caught exception")
-        f.write("#{e.class}\n")
-        f.write("#{e.message}\n")
-        f.write("#{e.backtrace.join("\n")}\n")
+      begin
+        @tester_exit_code = 0
+        # depencency_checker = Boxci::DependencyChecker.new
+        # depencency_checker.verify_all
+        initial_config(options)
+
+        create_project_folder
+        create_project_archive
+        write_vagrant_file
+        write_test_runner
+        if @provider_object.requires_plugin?
+          install_vagrant_plugin
+          add_provider_box
+        end
+        spin_up_box
+        setup_ssh_config
+        install_puppet_on_box
+        provision_box
+        create_artifact_directory
+        upload_test_runner
+        run_tests
+        download_artifacts
+        say "Finished!", :green
+      rescue Errno::EPIPE => e
+        File.open('/tmp/boxci.log', 'a+') do |f|
+          f.write("test() method swallowed Errno::EPIPE exception\n")
+        end
+      ensure
+        cleanup
       end
-      raise e
-    ensure
-      cleanup
+
       exit @tester_exit_code
     end
 
@@ -149,10 +140,7 @@ module Boxci
         if !system("vagrant plugin list | grep -q #{plugin}")
           # if vagrant plugin is missing
           say "You are missing the Vagrant plugin for #{provider}", :yellow
-          # ask user if it's ok to install for them
-          if yes?("Would you like to install it now?")
-            run "vagrant plugin install #{plugin}", :verbose => verbose?
-          end
+          run "vagrant plugin install #{plugin}", :verbose => verbose?
         else # if vagrant plugin is found
           say "Provider plugin #{plugin} found", :green
         end

data/lib/boxci/version.rb

@@ -1,3 +1,3 @@
 module Boxci
-  VERSION = "0.0.30"
+  VERSION = "0.0.31"
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'boxci'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxci
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Andrew De Ponte
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,8 +108,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
+- ".rspec"
 - ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -169,7 +172,7 @@ files:
 - spec/lib/boxci/tester_spec.rb
 - spec/lib/boxci_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/reachlocal/boxci
+homepage: http://boxci.io
 licenses:
 - MIT
 metadata: {}