octopusci 0.3.6 → 0.3.7

data/bin/octopusci-install

@@ -0,0 +1,131 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+APP_NAME = "octopusci-install"
+
+require 'rubygems'
+require 'octopusci/version'
+require 'trollop'
+
+module Octopusci
+	class Installer
+		def initialize(opts)
+			@opts = opts
+		end
+
+		def install
+			# Create user account for octopusci to use.
+			warn(account_exists?(@opts[:account]), "The \"#{@opts[:account]}\" user account already exists.") {
+				delete_account(@opts[:account])
+			}
+			create_account(@opts[:account], @opts[:shell], @opts[:uid], @opts[:gid])
+			puts "Created the \"#{@opts[:account]}\" account."
+
+			# Do the same stuff octopusci-skel currently does but also include the user and group that the octopusci-tentacles should run as
+			# in the config.yml so that when octopusci-tentacles launches as root at boot it can properly switch to the proper uid and guid
+
+			# Make sure that there exists a .ssh/config in the account home directory with the proper permissions and that config has the
+			# option that makes it so that when sshing to github it doesn't make you manually accept the server host key.
+		end
+
+		private
+
+		def create_account(account_name, shell, uid, gid)
+			if on_mac?
+				# Create the user entry.
+				`dscl . -create /Users/#{account_name}`
+
+				# Set the users shell.
+				`dscl . -create /Users/#{account_name} UserShell ${shell}`
+
+				# Set the users full name.
+				`dscl . -create /Users/#{account_name} RealName "#{account_name}"`
+
+				# Associate the user with a unique id.
+				`dscl . -create /Users/#{account_name} UniqueID #{uid}`
+
+				# Associate the user with a primary gorup id.
+				`dscl . -create /Users/#{account_name} PrimaryGroupID #{gid}`
+
+				# Create the users home directory.
+				`dscl . -create /Users/#{account_name} NFSHomeDirectory /Users/#{account_name}`
+
+				# Create the home directory and set the ownership properly.
+				`mkdir -p /Users/#{account_name}`
+				`chown -R #{uid}:#{gid} /Users/#{account_name}`
+
+				# Set the users password.
+				puts "Please enter the password for the \"#{account_name}\" account."
+				`passwd ${account_name}`
+			else
+				not_implemented
+			end
+		end
+
+		def delete_account(account_name)
+			if on_mac?
+				# Remove the directory services record
+				`dscl . -delete /Users/#{account_name}`
+			else
+				not_implemented
+			end
+		end
+
+		# Returns a boolean identifying if an account with the given name already exists or not
+		def account_exists?(account_name)
+			if on_mac?
+				cmd_out = `dscl . -search /Users name "#{account_name}"`
+				return cmd_out.empty? ? false : true
+			else
+				not_implenented
+			end
+		end
+
+		# Get a boolean representing if this is running on a Mac or not.
+		def on_mac?
+			return RUBY_PLATFORM.downcase.include?("darwin") ? true : false
+		end
+
+		def warn(warn, msg)
+			if warn
+				if @opts[:force]
+					puts "Warning: (Bypassed by -f) #{msg}"
+					yield
+				else
+					puts "Warning: #{msg}"
+					exit 2
+				end
+			end
+		end
+
+		def error(msg)
+			puts "Error: #{msg}"
+			exit 1
+		end
+
+		def not_implemented
+			error("Not currently implemented")
+		end
+
+	end
+end
+
+opts = Trollop::options do
+  version "Octopusci v#{Octopusci::Version} (c) Andrew De Ponte"
+  banner """Usage: #{APP_NAME} [-i|--install|-a|--account|-v|--version|-h|--help]"""
+  opt :install, "Actually install Octopusci.", :short => "-i", :default => false
+  opt :force, "Force the install to continue ignoring warnings", :short => "-f", :default => false
+  opt :account, "Account name to create for the Octopusci install", :short => "-a", :default => "octopusci"
+  opt :uid, "User id to assign to the user account that is going to be created", :short => "-u", :default => "498"
+  opt :gid, "Primary group id to assign to the user account that is going to be created", :short => "-g", :default => "1000"
+  opt :shell, "Shell that used by the account that is going to be created", :short => "-s", :default => "/bin/bash"
+end
+
+if Process.uid != 0
+  error("Must run as root.")
+end
+
+installer = Octopusci::Installer.new(opts)
+
+installer.install

data/bin/octopusci-post-build-request

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'rubygems'
+require 'octopusci/version'
+require 'trollop'
+require "uri"
+require "net/http"
+
+opts = Trollop::options do
+  version "Octopusci v#{Octopusci::Version} (c) Andrew De Ponte"
+  banner """Usage: octopusci-post-build-request [-v|--version|-h|--help]"""
+  opt :hostname, "Hostname/IP address to send the POST request to", :short => "-n", :default => '127.0.0.1'
+  opt :port, "Port number to connect to", :short => "-p", :default => 80
+  opt :repo_name, "Repository name to send build request for", :short => "-r", :default => "octopusci"
+  opt :branch_name, "Branch name to send build request for", :short => "-b", :default => 'master'
+  opt :owner_email, "Repository owner's email address", :short => "-o", :default => 'cyphactor@gmail.com'
+  opt :owner_name, "Repository owner's name", :short => "-w", :default => 'cyphactor'
+  opt :pusher_name, "Pusher's name", :short => "-u", :default => 'cyphactor'
+  opt :pusher_email, "Pusher's email address", :short => "-s", :default => 'pusher@example.com'
+end
+
+http = Net::HTTP.new(opts[:hostname], opts[:port])
+path = '/github-build'
+
+# POST request -> logging in
+params = { 'payload' => "{\"base_ref\":null,\"ref\":\"refs/heads/#{opts[:branch_name]}\",\"commits\":[{\"message\":\"shit son\",\"removed\":[],\"modified\":[\"test.txt\"],\"added\":[],\"author\":{\"username\":\"cyphactor\",\"email\":\"cyphactor@gmail.com\",\"name\":\"Andrew De Ponte\"},\"distinct\":true,\"timestamp\":\"2011-09-06T22:01:12-07:00\",\"id\":\"8573e06a3cb511babd9d19d33be637b661232011\",\"url\":\"https://github.com/cyphactor/octopusci/commit/8573e06a3cb511babd9d19d33be637b661232011\"},{\"message\":\"again broham\",\"removed\":[],\"modified\":[\"test.txt\"],\"added\":[],\"author\":{\"username\":\"cyphactor\",\"email\":\"cyphactor@gmail.com\",\"name\":\"Andrew De Ponte\"},\"distinct\":true,\"timestamp\":\"2011-09-06T23:01:07-07:00\",\"id\":\"771adb4b75694804f256e7e61704648a14d52afc\",\"url\":\"https://github.com/cyphactor/octopusci/commit/771adb4b75694804f256e7e61704648a14d52afc\"},{\"message\":\"again broham\",\"removed\":[],\"modified\":[\"test.txt\"],\"added\":[],\"author\":{\"username\":\"cyphactor\",\"email\":\"cyphactor@gmail.com\",\"name\":\"Andrew De Ponte\"},\"distinct\":true,\"timestamp\":\"2011-09-06T23:03:16-07:00\",\"id\":\"dadf8446b2037960cc6223d60a7d57c5d264fa48\",\"url\":\"https://github.com/cyphactor/octopusci/commit/dadf8446b2037960cc6223d60a7d57c5d264fa48\"}],\"created\":false,\"before\":\"e5a1385fd8654c46d2b52d90c1ba31c865493602\",\"repository\":{\"created_at\":\"2011/09/02 12:40:14 -0700\",\"open_issues\":0,\"forks\":1,\"description\":\"Temp repo for testing pusci as I dev it\",\"has_wiki\":true,\"fork\":false,\"watchers\":1,\"has_downloads\":true,\"homepage\":\"\",\"has_issues\":true,\"private\":false,\"size\":116,\"owner\":{\"email\":\"#{opts[:owner_email]}\",\"name\":\"#{opts[:owner_name]}\"},\"name\":\"#{opts[:repo_name]}\",\"pushed_at\":\"2011/09/06 23:03:21 -0700\",\"url\":\"https://github.com/cyphactor/octopusci\"},\"pusher\":{\"email\":\"#{opts[:pusher_email]}\",\"name\":\"#{opts[:pusher_name]}\"},\"forced\":false,\"after\":\"dd6e7913cc12937db88e469684e8698f8eee8c14\",\"deleted\":false,\"compare\":\"https://github.com/cyphactor/octopusci/compare/e5a1385...dd6e791\"}" }
+
+data = URI.encode_www_form(params)
+headers = {
+	'Accept' => '*/*',
+  'Content-Type' => 'application/x-www-form-urlencoded',
+  'X-Github-Event' => 'push'
+}
+
+resp, data = http.post(path, data, headers)
+
+puts 'Code = ' + resp.code
+puts 'Message = ' + resp.message
+resp.each {|key, val| puts key + ' = ' + val}
+puts data

data/bin/octopusci-reset-redis

@@ -3,24 +3,51 @@
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
-require 'octopusci'
+require 'octopusci/version'
+require 'octopusci/job_store'
+require 'trollop'
+
+opts = Trollop::options do
+  version "Octopusci v#{Octopusci::Version} (c) Andrew De Ponte"
+  banner """Usage: octopusci-reset-redis [-r|-v|--version|-h|--help]"""
+  opt :reset, "Actually reset the redis datastore", :short => "-r", :default => false
+end
 
-num_jobs = Octopusci::JobStore.size
-jobs = Octopusci::JobStore.list(0, num_jobs)
+if opts[:reset]
+	num_jobs = Octopusci::JobStore.size
+	jobs = Octopusci::JobStore.list(0, num_jobs)
 
-jobs.each do |j|
-  # delete the actual job record
-  Octopusci::JobStore.redis.del("octopusci:jobs:#{j['id']}")
+	jobs.each do |j|
+	  # delete the actual job record
+	  Octopusci::JobStore.redis.del("octopusci:jobs:#{j['id']}")
 
-  # delete the repo_name, branch_name job references
-  Octopusci::JobStore.redis.del("octopusci:#{j['repo_name']}:#{j['branch_name']}:jobs")
+	  # delete the repo_name, branch_name job references
+	  Octopusci::JobStore.redis.del("octopusci:#{j['repo_name']}:#{j['branch_name']}:jobs")
 
-  # delete the github payload for the repo_name, branch_name
-  Octopusci::JobStore.redis.del("octopusci:github_payload:#{j['repo_name']}:#{j['branch_name']}")
+	  # delete the github payload for the repo_name, branch_name
+	  Octopusci::JobStore.redis.del("octopusci:github_payload:#{j['repo_name']}:#{j['branch_name']}")
 
-end
+	end
+
+	Octopusci::JobStore.redis.del('octopusci:job_count')
+	Octopusci::JobStore.redis.del('octopusci:jobs')
+	Octopusci::JobStore.redis.del('octopusci:stagelocker')
+	Octopusci::JobStore.redis.del('queue:octopusci:commit')
+else
+	puts %Q{THIS IS A WARNING. THIS IS A DESTRUCTIVE COMMAND!
+
+This command is designed to allow you to reset/clear out the values in your redis
+data store associated with Octopusci. If you run this command with the proper option
+it will actually get rid of all of the data stored in the redis datae store for Octopusci.
+It is intended to be used very rarely and only by people that understand exactly what it
+is going to do (primarily Octopusci Developers).
 
-Octopusci::JobStore.redis.del('octopusci:job_count')
-Octopusci::JobStore.redis.del('octopusci:jobs')
-Octopusci::JobStore.redis.del('octopusci:stagelocker')
-Octopusci::JobStore.redis.del('queue:octopusci:commit')
+To go forward and actually reset the redis data store with respect to Octopusci run it using
+the following example.
+
+Example:
+octopusci-reset-redis -r
+
+}
+
+end

data/bin/octopusci-reset-stage-locker

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'rubygems'
+require 'octopusci/version'
+require 'trollop'
+
+opts = Trollop::options do
+  version "Octopusci v#{Octopusci::Version} (c) Andrew De Ponte"
+  banner """Usage: octopusci-reset-stage-locker [-r|-v|--version|-h|--help]"""
+  opt :reset, "Actually reset the stage locker", :short => "-r", :default => false
+end
+
+if opts[:reset]
+	puts "Reseting the Octopusci StageLocker, please wait..."
+	require 'octopusci'
+  Octopusci::StageLocker.load(Octopusci::Config['stages'])
+  puts "Succesfully Reset the Octopusci StageLocker"
+else
+	puts %Q{THIS IS A WARNING. THIS IS A DESTRUCTIVE COMMAND!
+
+This command is designed to allow you to reset/clear out the Octopusci StageLocker
+and repopulate it with the stages defined in the config. If you run this command
+with the proper option it will actually get rid of the Octopusci StageLocker and
+recreate it with the stage values from the Octopusci config. It is intended to be
+used very rarely.
+
+The primary use case for it is that you have added a stage to your Octopusci setup
+after already doing the initial setup. Running this command is necessary to make
+Octopusci aware of the new stages you have added to the config since the initial
+setup.
+
+WARNING: You should not run this command until all job processes have completed.
+Running 'octopusci-tentacles stop' only requests that the tentacles stop running
+future jobs and that they kill themselves off once they are done with any current
+jobs they are running. So, be sure you wait for the currently running jobs to
+exit before you run this command or you could end up with multiple jobs running
+on a single stage.
+
+To go forward and actually reset the Octopusci StageLocker simply run the command
+using the following example.
+
+Example:
+octopusci-reset-stage-locker -r
+
+}
+
+end

data/bin/octopusci-skel

@@ -2,25 +2,34 @@
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
+APP_NAME = "octopusci-skel"
+
 require 'rubygems'
+require 'octopusci/version'
 require 'fileutils'
+require 'trollop'
 
 if Process.uid != 0
   puts "Must run as root"
   exit 1
 end
 
+opts = Trollop::options do
+  version "Octopusci v#{Octopusci::Version} (c) Andrew De Ponte"
+  banner """Usage: #{APP_NAME} [-c|-v|--version|-h|--help]"""
+  opt :create, "Actually create any missing pieces of the Octopusci Skeleton.", :short => "-c", :default => false
+end
+
 JOBS_PATH = '/etc/octopusci/jobs'
 CONFIG_PATH = '/etc/octopusci/config.yml'
+OCTOPUSCI_BUILD_PATH = '/etc/octopusci/jobs/octopusci_rspec_build_local.rb'
+WORKSPACE_BASE_PATH = '/var/octopusci'
 
-FileUtils.mkdir_p(JOBS_PATH)
-
-if !File.exists?(CONFIG_PATH)
-  File.open(CONFIG_PATH, 'w') do |f|
-    f << "general:
-  jobs_path: \"/etc/octopusci/jobs\"
-  base_url: \"http://localhost:9998\"
-  workspace_base_path: \"/Users/octopusci/.octopusci\"
+config_default_content = %Q{
+general:
+  jobs_path: "/etc/octopusci/jobs"
+  workspace_base_path: "#{WORKSPACE_BASE_PATH}"
+  base_url: "http://localhost:9998"
 
 http_basic:
   username: admin
@@ -37,15 +46,52 @@ smtp:
   raise_delivery_errors: true
 
 projects:
-  - { name: octopusci, owner: cyphactor, job_klass: SomeJobClass, repo_uri: 'git@github.com:cyphactor/octopusci.git', default_email: devs@example.com }
+  - { name: octopusci, owner: cyphactor, job_klass: OctopusciRSpecBuildLocal, repo_uri: 'git@github.com:cyphactor/octopusci.git', default_email: devs@example.com }
 
 stages:
-  - test_b
-    "
+  - test_a
+}
+
+octopusci_build_default_content = %Q{
+class OctopusciRSpecBuildLocal < Octopusci::Job
+  def self.run(job_rec)
+    context "RSpec Tests (commit)" do
+      run_shell_cmd!("bundle install", true)
+      run_shell_cmd!("STAGE=\#{job_rec['stage']} bundle exec rspec spec 2>&1")
+    end
   end
-  puts "Created example #{CONFIG_PATH}, please modify appropriately"
-else
-  puts "#{CONFIG_PATH} already exists, exiting to avoid modification."
-  puts "If you would like to generated the example config again please rename the existing #{CONFIG_PATH}."
 end
+}
 
+if opts[:create]
+  FileUtils.mkdir_p(JOBS_PATH)
+  puts "1. Ran mkdir -p #{JOBS_PATH}"
+  FileUtils.mkdir_p(WORKSPACE_BASE_PATH)
+  puts "2. Ran mkdir -p #{WORKSPACE_BASE_PATH}"
+
+  if !File.exists?(CONFIG_PATH)
+    File.open(CONFIG_PATH, 'w') do |f|
+      f << config_default_content
+    end
+    puts "3. Created example #{CONFIG_PATH}. Please modify appropriately"
+  else
+    puts "3. #{CONFIG_PATH} already exists. It has NOT been modified."
+    puts "   If you would like to generate the example config again please rename the existing #{CONFIG_PATH} and rerun #{APP_NAME}."
+  end
+
+  if !File.exists?(OCTOPUSCI_BUILD_PATH)
+    File.open(OCTOPUSCI_BUILD_PATH, 'w') do |f|
+      f << octopusci_build_default_content
+    end
+    puts "4. Created example job definition (#{OCTOPUSCI_BUILD_PATH}). Please use as a starting point for your own jobs."
+  else
+    puts "4. #{OCTOPUSCI_BUILD_PATH} already exists. It has NOT been modified."
+    puts "   If you would like to generate the example job definition again please rename the existing #{OCTOPUSCI_BUILD_PATH} and rerun #{APP_NAME}"
+  end
+else
+  puts "This is a Dry Run\n  No actions have been taken this is simply a description of what would take place if you ran this command with the create option (-c).\n\n"
+  puts "  1. mkdir -p #{JOBS_PATH}"
+  puts "  2. mkdir -p #{WORKSPACE_BASE_PATH}"
+  puts "  3. Create example config (#{CONFIG_PATH}) if one doesn't exist"
+  puts "  4. Create example job definition (#{OCTOPUSCI_BUILD_PATH}) if it doesn't exist"
+end

data/bin/octopusci-tentacles

@@ -1,44 +1,58 @@
 #!/usr/bin/env ruby
 
-def display_help
-  puts "Usage: octopusci-tentacles <command>"
-  puts "  Acceptable Commands:"
-  puts "    start - Cleanup existing workers and start new worker processes in the background"
-  puts "     stop - Signals workers to exit when current job is finished"
-  puts "  restart - Synonym for the 'start' command, just here for convenience"
-  puts "     help - Display this help"
-  puts ""
-  puts "  Example: octopusci-tentacles start"
-  puts ""
-end
-
-if !["start", "stop", "restart", "help"].include?(ARGV[0])
-  display_help()
-  exit 1
-end
-
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'octopusci'
+require 'trollop'
+
+SUB_COMMANDS = %w(start, restart, stop, help)
+
+p = Trollop::Parser.new do
+  version "Octopusci v#{Octopusci::Version} (c) Andrew De Ponte"
+  banner """Usage: octopusci-tentacles [-v|--version|-h|--help] <subcommand>
+  Acceptable SubCommands:
+      start - Cleanup existing workers and start new worker processes in the background
+       stop - Signals workers to exit when current job is finished
+    restart - Synonym for the 'start' command, just here for convenience
+       help - Display this help
+
+  Available Options:
+"""
+  stop_on SUB_COMMANDS
+end
+
+opts = Trollop::with_standard_exception_handling(p) do
+  o = p.parse ARGV
+  raise Trollop::HelpNeeded if ARGV.empty? # show help screen
+  o
+end
+
+def start_or_restart
+  # The StageLocker.load() method is called here not only to set things into
+  # valid initial state. But, also in the case that octopusci-tentacles was
+  # killed it nukes the potentially screwed up state the redis data is in and
+  # initializes it the proper state based on the config.
+  if Octopusci::Config.has_key?('stages') && Octopusci::StageLocker.empty?
+    puts "Reseting stage locker and loading stages in from config."
+    Octopusci::StageLocker.load(Octopusci::Config['stages'])
+  end
 
-# The StageLocker.load() method is called here not only to set things into
-# valid initial state. But, also in the case that octopusci-tentacles was
-# killed it nukes the potentially screwed up state the redis data is in and
-# initializes it the proper state based on the config.
-if Octopusci::Config.has_key?('stages')
-  Octopusci::StageLocker.load(Octopusci::Config['stages'])
+  Octopusci::WorkerLauncher.cleanup_existing_workers()
+  Octopusci::WorkerLauncher.launch()
 end
 
-case ARGV[0]
+cmd = ARGV.shift # get the subcommand
+case cmd
   when "start"
-    Octopusci::WorkerLauncher.cleanup_existing_workers()
-    Octopusci::WorkerLauncher.launch()
+    start_or_restart()
   when "restart"
-    Octopusci::WorkerLauncher.cleanup_existing_workers()
-    Octopusci::WorkerLauncher.launch()    
+    start_or_restart()
   when "stop"
     Octopusci::WorkerLauncher.cleanup_existing_workers()
   when "help"
-    display_help()
+    p.educate
+  else
+    p.die "unknown subcommand #{cmd.inspect}", nil
 end
+

data/lib/octopusci/job.rb

@@ -118,7 +118,7 @@ module Octopusci
     end
 
     def self.checkout_branch(job_conf)
-      return run_shell_cmd("cd #{repository_path} 2>&1 && git fetch --all -p 2>&1 && git checkout #{@job['branch_name']} 2>&1 && git pull -f origin #{@job['branch_name']}:#{@job['branch_name']} 2>&1", true, false)
+      return run_shell_cmd("cd #{repository_path} 2>&1 && git fetch --all -p 2>&1 && git reset --hard && git checkout #{@job['branch_name']} 2>&1 && git pull -f origin #{@job['branch_name']}:#{@job['branch_name']} 2>&1", true, false)
     end
 
     def self.get_recip_email

data/lib/octopusci/job_store.rb

@@ -1,3 +1,6 @@
+require 'resque'
+require 'yaml'
+
 module Octopusci
   class JobStore
     def self.prepend(job)

data/lib/octopusci/server/views/layout.erb

@@ -22,6 +22,11 @@
         color: white;
         background-color: #333;
       }
+
+      .version {
+        font-size: 11px;
+        margin-right: 10px;
+      }
       
       #main_content_area {
         width: 960px;
@@ -161,7 +166,7 @@
   <body>
     <div id="header">
       <div id="logo">
-        Octopusci <% if @page_logo %> - <%= @page_logo %><% end %>
+        Octopusci <span class="version">v<%= Octopusci::Version %></span><% if @page_logo %>( <%= @page_logo %> )<% end %>
       </div>
       <div id="main_nav">
         <a href="/">Dashboard</a>

data/lib/octopusci/stage_locker.rb

@@ -6,6 +6,14 @@ module Octopusci
       clear
       stages.each { |s| push(s) }
     end
+
+    def self.exists?
+      self.redis.exists('octopusci:stagelocker')
+    end
+
+    def self.empty?
+      !exists?
+    end
     
     def self.clear
       self.redis.del('octopusci:stagelocker')

data/lib/octopusci/version.rb

@@ -1,3 +1,3 @@
 module Octopusci
-  Version = VERSION = '0.3.6'
+  Version = VERSION = '0.3.7'
 end

data/spec/lib/octopusci/stage_locker_spec.rb

@@ -17,6 +17,35 @@ describe "Octopusci::StageLocker" do
     end
   end
 
+  describe "#exists?" do
+    it "should check if the redis key exists for the stage locker" do
+      @mock_redis.should_receive(:exists).with('octopusci:stagelocker')    
+      Octopusci::StageLocker.exists?
+    end
+
+    it "should return fales if the stage locker key does not exists in redis" do
+      @mock_redis.stub(:exists).and_return(false)
+      Octopusci::StageLocker.exists?.should == false
+    end
+
+    it "should return true if the stage locker key exists in redis" do
+      @mock_redis.stub(:exists).and_return(true)
+      Octopusci::StageLocker.exists?.should == true
+    end
+  end
+
+  describe "#empty?" do
+    it "should return true if exists? returns false" do
+      Octopusci::StageLocker.stub(:exists?).and_return(false)
+      Octopusci::StageLocker.empty?.should == true
+    end
+
+    it "should return false if exists? returns true" do
+      Octopusci::StageLocker.stub(:exists?).and_return(true)
+      Octopusci::StageLocker.empty?.should == false
+    end
+  end
+
   describe "#clear" do
     it "should clear all of the stages out of the stage locker" do
       r = mock('redis')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopusci
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-12 00:00:00.000000000 Z
+date: 2011-12-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70209939639560 !ruby/object:Gem::Requirement
+  requirement: &70349244223700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209939639560
+  version_requirements: *70349244223700
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70209939638360 !ruby/object:Gem::Requirement
+  requirement: &70349244223280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209939638360
+  version_requirements: *70349244223280
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70209939637360 !ruby/object:Gem::Requirement
+  requirement: &70349244222860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209939637360
+  version_requirements: *70349244222860
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70209939636720 !ruby/object:Gem::Requirement
+  requirement: &70349244222440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209939636720
+  version_requirements: *70349244222440
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70209939635860 !ruby/object:Gem::Requirement
+  requirement: &70349244222020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209939635860
+  version_requirements: *70349244222020
 - !ruby/object:Gem::Dependency
   name: time-ago-in-words
-  requirement: &70209939635160 !ruby/object:Gem::Requirement
+  requirement: &70349244221600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209939635160
+  version_requirements: *70349244221600
 - !ruby/object:Gem::Dependency
   name: ansi2html
-  requirement: &70209939634180 !ruby/object:Gem::Requirement
+  requirement: &70349244221180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209939634180
+  version_requirements: *70349244221180
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: &70349244220760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70349244220760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70209939632520 !ruby/object:Gem::Requirement
+  requirement: &70349244220340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209939632520
+  version_requirements: *70349244220340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70209939632020 !ruby/object:Gem::Requirement
+  requirement: &70349244219920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209939632020
+  version_requirements: *70349244219920
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70209939631460 !ruby/object:Gem::Requirement
+  requirement: &70349244219500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209939631460
+  version_requirements: *70349244219500
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70209939630660 !ruby/object:Gem::Requirement
+  requirement: &70349244235460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209939630660
+  version_requirements: *70349244235460
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70209939628140 !ruby/object:Gem::Requirement
+  requirement: &70349244235040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209939628140
+  version_requirements: *70349244235040
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &70209939626500 !ruby/object:Gem::Requirement
+  requirement: &70349244234620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +165,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209939626500
+  version_requirements: *70349244234620
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70209939624700 !ruby/object:Gem::Requirement
+  requirement: &70349244234200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,8 +176,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209939624700
-description: A multi-branch Continous Integration server that integrates with GitHub
+  version_requirements: *70349244234200
+description: A multi-branch Continuous Integration server that integrates with GitHub
 email:
 - cyphactor@gmail.com
 - sarmiena@gmail.com
@@ -174,6 +185,8 @@ executables:
 - octopusci-tentacles
 - octopusci-skel
 - octopusci-reset-redis
+- octopusci-reset-stage-locker
+- octopusci-post-build-request
 extensions: []
 extra_rdoc_files: []
 files:
@@ -204,11 +217,12 @@ files:
 - lib/octopusci/version.rb
 - lib/octopusci/worker_launcher.rb
 - lib/octopusci.rb
-- bin/octopusci
+- bin/octopusci-install
+- bin/octopusci-post-build-request
 - bin/octopusci-reset-redis
+- bin/octopusci-reset-stage-locker
 - bin/octopusci-skel
 - bin/octopusci-tentacles
-- bin/pusci-stage
 - spec/lib/octopusci/config_spec.rb
 - spec/lib/octopusci/io_spec.rb
 - spec/lib/octopusci/job_spec.rb

data/bin/octopusci

@@ -1,56 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'optparse'
-
-# This hash will hold all of the options
-# parsed from the command-line by
-# OptionParser.
-options = {}
-
-optparse = OptionParser.new do|opts|
-  # Set a banner, displayed at the top
-  # of the help screen.
-  opts.banner = "Usage: optparse1.rb [options] file1 file2 ..."
-
-  # Define the options, and what they do
-  options[:verbose] = false
-  opts.on( '-v', '--verbose', 'Output more information' ) do
-    options[:verbose] = true
-  end
-
-  options[:quick] = false
-  opts.on( '-q', '--quick', 'Perform the task quickly' ) do
-    options[:quick] = true
-  end
-
-  options[:logfile] = nil
-  opts.on( '-l', '--logfile FILE', 'Write log to FILE' ) do |file|
-    options[:logfile] = file
-  end
-
-  # This displays the help screen, all programs are
-  # assumed to have this option.
-  opts.on( '-h', '--help', 'Display this screen' ) do
-    puts opts
-    exit
-  end
-end
-
-# Parse the command-line. Remember there are two forms
-# of the parse method. The 'parse' method simply parses
-# ARGV, while the 'parse!' method parses ARGV and removes
-# any options found there, as well as any parameters for
-# the options. What's left is the list of files to resize.
-optparse.parse!
-
-puts "Being verbose" if options[:verbose]
-puts "Being quick" if options[:quick]
-puts "Logging to file #{options[:logfile]}" if options[:logfile]
-
-ARGV.each do|f|
-  puts "Resizing image #{f}..."
-  sleep 0.5
-end

data/bin/pusci-stage

@@ -1,67 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'optparse'
-require 'octopusci'
-
-# This hash will hold all of the options
-# parsed from the command-line by
-# OptionParser.
-options = {}
-
-optparse = OptionParser.new do|opts|
-  # Set a banner, displayed at the top
-  # of the help screen.
-  opts.banner = "Usage: pusci-stage [options] stage_name"
-
-  # Define the options, and what they do
-  options[:add] = false
-  opts.on('-a', '--add', 'Add a stage back into the pool') do
-    options[:add] = true
-  end
-
-  options[:rem] = false
-  opts.on( '-r', '--rem', 'Rem a stage from the pool' ) do
-    options[:rem] = true
-  end
-
-  options[:list] = false
-  opts.on( '-l', '--list', 'List all stages' ) do
-    options[:list] = true
-  end
-
-  options[:pool] = false
-  opts.on( '-p', '--pool', 'List all stages currently in the pool' ) do
-    options[:pool] = true
-  end
-
-  # This displays the help screen, all programs are
-  # assumed to have this option.
-  opts.on( '-h', '--help', 'Display the help screen' ) do
-    puts opts
-    exit
-  end
-end
-
-# Parse the command-line. Remember there are two forms
-# of the parse method. The 'parse' method simply parses
-# ARGV, while the 'parse!' method parses ARGV and removes
-# any options found there, as well as any parameters for
-# the options. What's left is the list of files to resize.
-optparse.parse!
-
-if options[:list] == true
-  Octopusci::StageLocker.stages.each do |s|
-    puts s
-  end
-elsif options[:pool] == true
-  puts Octopusci::StageLocker.pool
-elsif options[:add] == true
-  Octopusci::StageLocker.push(ARGV[0])
-elsif options[:rem] == true
-  Octopusci::StageLocker.rem(ARGV[0])
-end
-
-exit