octopusci 0.2.3 → 0.3.0

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

@@ -1,8 +1,7 @@
 <script type="text/javascript" charset="utf-8">
   $(document).ready(function() {
     $('#jobs').delegate("a.show_hide_job_output", 'click', function() {
-      $('.job_output').not(this).hide();      
-      var job_cont = $(this).closest('.job_summary').next('.job_content')
+      var job_cont = $(this).closest('.job_summary').next('.job_content');
       var job_out = job_cont.find('.job_output').first();
       job_out.toggle();
       return false;      
@@ -20,12 +19,12 @@
 </script>
 <div id="jobs">
   <% @jobs.each do |j| %>
-    <div id="job_<%= j.id%>" class="job status_<%= j.status %>" data-status-url="/jobs/<%= j.id %>/status" data-output-url="/jobs/<%= j.id %>/output" data-summary-url="/jobs/<%= j.id %>/ajax_summary">
+    <div id="job_<%= j['id']%>" class="job status_<%= j['status'] %>" data-status-url="/jobs/<%= j['id'] %>/status" data-output-url="/jobs/<%= j['id'] %>/output" data-summary-url="/jobs/<%= j['id'] %>/ajax_summary">
       <div class="job_summary">
         <%= erb :job_summary, :locals => { :j => j } %>
       </div>
       <div class="job_content">
-        <div class="job_output"><pre><code><%= j.output %></code></pre></div>
+        <div class="job_output"><pre><code><%= Octopusci::IO.new(j).read_all_out %></code></pre></div>
       </div>
     </div>
   <% end %>

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

@@ -11,16 +11,16 @@
     }, 5000);
   });
 </script>
-<div id="job_<%= @job.id%>" class="job status_<%= @job.status %>" data-status-url="/jobs/<%= @job.id %>/status" data-output-url="/jobs/<%= @job.id %>/output" data-silent-output-url="/jobs/<%= @job.id %>/silent_output" data-summary-url="/jobs/<%= @job.id %>/ajax_summary">
+<div id="job_<%= @job['id']%>" class="job status_<%= @job['status'] %>" data-status-url="/jobs/<%= @job['id'] %>/status" data-output-url="/jobs/<%= @job['id'] %>/output" data-silent-output-url="/jobs/<%= @job['id'] %>/silent_output" data-summary-url="/jobs/<%= @job['id'] %>/ajax_summary">
   <div class="job_summary">
     <%= erb :job_summary, :locals => { :j => @job } %>
   </div>
   <div class="job_content">
     Output:
-    <div class="output job_output" style="display: block;"><pre><code><%= @job.output %></code></pre></div>
+    <div class="output job_output" style="display: block;"><pre><code><%= Octopusci::IO.new(@job).read_all_out %></code></pre></div>
   </div>
   <div class="job_content">
     Log:
-    <div class="silent_output job_output" style="display: block;"><pre><code><%= @job.silent_output %></code></pre></div>
+    <div class="silent_output job_output" style="display: block;"><pre><code><%= Octopusci::IO.new(@job).read_all_log %></code></pre></div>
   </div>
 </div>

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

@@ -1,13 +1,13 @@
 <div class="job_header">
   <div class="job_title">
-    <span class="status <%= j.status %>"></span>
+    <span class="status <%= j['status'] %>"></span>
     <div style="float: left;">
-      <a href="<%= j.payload['repository']['url'] %>"><%= j.repo_name %></a> / <a href="/<%= j.repo_name %>/<%= j.branch_name %>/jobs"><%= j.branch_name %></a>
+      <a href="<%= j['payload']['repository']['url'] %>"><%= j['repo_name'] %></a> / <a href="/<%= j['repo_name'] %>/<%= j['branch_name'] %>/jobs"><%= j['branch_name'] %></a>
     </div>
     <div style="clear: both;"></div>
   </div>
   <div class="created_on">
-    <%= j.created_at.strftime('%A, %B %d, %Y AT %I:%M%p') %>
+    <%= j['created_at'].strftime('%A, %B %d, %Y AT %I:%M%p') unless j['created_at'].nil? %>
   </div>
   <div style="clear: both;"></div>
 </div>
@@ -15,11 +15,11 @@
   <table>
     <tr>
       <td style="text-align: right;">Job:</td>
-      <td style="width: 200px;"><a href="/jobs/<%= j.id %>"><%= j.id %></a></td>
+      <td style="width: 200px;"><a href="/jobs/<%= j['id'] %>"><%= j['id'] %></a></td>
       <td style="text-align: right;">Before Commit:</td>
       <td>
-        <% if !j.payload['created'] %>
-          <%= j.payload['before'] %>
+        <% if !j['payload']['created'] %>
+          <%= j['payload']['before'] %>
         <% else %>
           No before commit, remote branch was created with this push.
         <% end %>
@@ -28,49 +28,49 @@
     <tr>
       <td style="text-align: right;">Finished:</td>
       <td>
-        <% if j.ended_at %>
-          <%= j.ended_at.ago_in_words %>
+        <% if j['ended_at'] %>
+          <%= j['ended_at'].ago_in_words %>
         <% else %>
           -
         <% end %>
       </td>
       <td style="text-align: right;">After Commit:</td>
       <td>
-        <%= j.payload['after'] %>
+        <%= j['payload']['after'] %>
       </td>
     </tr>
     <tr>
       <td style="text-align: right;">Duration:</td>
       <td>
-        <% if j.ended_at && j.started_at %>
-          <%= ((j.ended_at - j.started_at)/60).to_i %> minutes
+        <% if j['ended_at'] && j['started_at'] %>
+          <%= ((j['ended_at'] - j['started_at'])/60).to_i %> minutes
         <% else %>
           -
         <% end %>
       </td>
       <td style="text-align: right;">Compare:</td>
-      <td><a href="<%= j.compare %>"><%= j.compare %></a></td>
+      <td><a href="<%= j['compare'] %>"><%= j['compare'] %></a></td>
     </tr>
     <tr>
       <td style="text-align: right;">Stage:</td>
-      <td><%= j.stage %></td>
+      <td><%= j['stage'] %></td>
       <td style="text-align: right;">Pusher:</td>
       <td>
-        <% if j.payload['pusher']['email'] %>
-          <a href="mailto:<%= j.payload['pusher']['name'] %>"><%= j.payload['pusher']['name'] %></a>
+        <% if j['payload']['pusher']['email'] %>
+          <a href="mailto:<%= j['payload']['pusher']['name'] %>"><%= j['payload']['pusher']['name'] %></a>
         <% else %>
-          <%= j.payload['pusher']['name'] %>
+          <%= j['payload']['pusher']['name'] %>
         <% end %>
       </td>
     </tr>
     <tr>
       <td style="text-align: right;">Output:</td>
       <td>
-          <a class="show_hide_job_output" style="display: block; float: left;" href="#">toggle</a><div class="output_busy" style="float: left; margin-left: 5px; margin-top: 2px; <% if j.status == 'running' %>display: block;<% else %>display: none;<% end %>"><img src="/images/ajax-loader-1.gif" style="height: 12px;"/></div><div style="clear: both;"></div>
+          <a class="show_hide_job_output" style="display: block; float: left;" href="#">toggle</a><div class="output_busy" style="float: left; margin-left: 5px; margin-top: 2px; <% if j['status'] == 'running' %>display: block;<% else %>display: none;<% end %>"><img src="/images/ajax-loader-1.gif" style="height: 12px;"/></div><div style="clear: both;"></div>
       </td>
       <td style="text-align: right;">Log:</td>
       <td>
-          <a target="_blank" href="/jobs/<%= j.id %>/silent_output">click here</a>
+          <a target="_blank" href="/jobs/<%= j['id'] %>/silent_output">click here</a>
       </td>
     </tr>
   </table>

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

@@ -103,25 +103,26 @@
         height: 26px;
         display: block;
         margin: 0 0 0 0;
+        background-position: 0px -74px; /* pending... in the case that no status specific class is provided but this is, the default case */
       }
       
-      .successful {
+      .status.successful {
         background-position: 0px 0px;
       }
       
-      .failed {
+      .status.failed {
         background-position: 0px -26px;
       }
       
-      .running {
+      .status.running {
         background-position: 0px -52px;
       }
       
-      .pending {
+      .status.pending {
         background-position: 0px -74px;
       }
 
-      .error {
+      .status.error {
         background-position: 0px -26px;
       }
     </style>

data/lib/octopusci/stage_locker.rb

@@ -8,28 +8,32 @@ module Octopusci
     end
     
     def self.clear
-      Resque.redis.del('octopusci:stagelocker')
+      self.redis.del('octopusci:stagelocker')
     end
     
     def self.pop
-      Resque.redis.lpop('octopusci:stagelocker')
+      self.redis.lpop('octopusci:stagelocker')
     end
     
     def self.rem(v)
-      Resque.redis.lrem('octopusci:stagelocker', 1, v)
+      self.redis.lrem('octopusci:stagelocker', 1, v)
     end
     
     def self.push(v)
-      Resque.redis.rpush('octopusci:stagelocker', v)
+      self.redis.rpush('octopusci:stagelocker', v)
     end
     
     def self.stages
-      Octopusci::CONFIG['stages']
+      Octopusci::Config['stages']
     end
     
     def self.pool
-      len = Resque.size('octopusci:stagelocker')
-      Resque.peek('octopusci:stagelocker', 0, len)
+      len = self.redis.size('octopusci:stagelocker')
+      self.redis.peek('octopusci:stagelocker', 0, len)
+    end
+
+    def self.redis
+      Resque.redis
     end
   end
 end

data/lib/octopusci/version.rb

@@ -1,3 +1,3 @@
 module Octopusci
-  Version = VERSION = '0.2.3'
+  Version = VERSION = '0.3.0'
 end

data/lib/octopusci/worker_launcher.rb

@@ -27,7 +27,7 @@ module Octopusci
 
       worker_pids = []
       
-      Octopusci::CONFIG['stages'].size.times do
+      Octopusci::Config['stages'].size.times do
         cur_pid = Process.fork do
           queues = ['octopusci:commit']
           worker = Resque::Worker.new(*queues)

data/spec/lib/octopusci/config_spec.rb

@@ -0,0 +1,195 @@
+require 'spec_helper'
+
+describe Octopusci::ConfigStore do
+
+  before(:each) do
+    @config_store = Octopusci::ConfigStore.new
+  end
+
+  describe "#initialize" do
+    it "should create an instance of Octopusci::ConfigStore class with an empty options set" do
+      @config_store.options.should == {}
+    end
+  end
+
+  describe "#options" do
+    it "should return a hash of the options" do
+      @config_store.options.class.should == Hash
+    end
+  end
+
+  describe "#load" do
+    it "should load a yml file into the options set additively" do
+      tmp_file_path = "/tmp/octopusci_test_config.yml"
+      File.open(tmp_file_path, "w") do |f|
+        f << "jack:\n"
+        f << "  jobs_path: \"/etc/octopusci/jobs\"\n"
+        f << "  workspace_base_path: \"/Users/adeponte/.octopusci\"\n"
+      end
+
+      @config_store.load(tmp_file_path)
+
+      @config_store.options.should == { 'jack' => { 'jobs_path' => "/etc/octopusci/jobs", "workspace_base_path" => "/Users/adeponte/.octopusci" } }
+
+      tmp_file_path = "/tmp/octopusci_test_config.yml"
+      File.open(tmp_file_path, "w") do |f|
+        f << "joe:\n"
+        f << "  hello: \"world\"\n"
+      end
+
+      @config_store.load(tmp_file_path)
+
+      @config_store.options.should == { 'jack' => { 'jobs_path' => "/etc/octopusci/jobs", "workspace_base_path" => "/Users/adeponte/.octopusci" }, 'joe' => { 'hello' => 'world' } }
+    end
+
+    it "should load a provided block into the options set additively" do
+      @config_store.load() do |c|
+        c['jackie'] = 'fool'
+      end
+
+      @config_store.options.should == { 'jackie' => 'fool' }
+
+      @config_store.load() do |c|
+        c['brown'] = 'ace'
+      end
+
+      @config_store.options.should == { 'jackie' => 'fool', 'brown' => 'ace' }
+    end
+
+    it "should load a yml file and a provided block into the options set additively" do
+      tmp_file_path = "/tmp/octopusci_test_config.yml"
+      File.open(tmp_file_path, "w") do |f|
+        f << "alice:\n"
+        f << "  hi: \"there\"\n"
+      end
+
+      @config_store.load(tmp_file_path) do |c|
+        c['bob'] = 'hey alice'
+      end
+
+      @config_store.options.should == { 'alice' => { 'hi' => 'there' }, 'bob' => 'hey alice' }
+
+      tmp_file_path = "/tmp/octopusci_test_config.yml"
+      File.open(tmp_file_path, "w") do |f|
+        f << "cindy:\n"
+        f << "  good: \"bye\"\n"
+      end
+
+      @config_store.load(tmp_file_path) do |c|
+        c['rachel'] = 'cya'
+      end
+
+      @config_store.options.should == { 'alice' => { 'hi' => 'there' }, 'bob' => 'hey alice', 'cindy' => { 'good' => 'bye' }, 'rachel' => 'cya' }
+    end
+  end
+
+  describe "#reset" do
+    it "should reset the options set back to an empty set" do
+      @config_store.load() do |c|
+        c['kitty'] = 'little'
+      end
+
+      @config_store.options.should == { 'kitty' => 'little' }
+
+      @config_store.reset()
+
+      @config_store.options.should == {}
+    end
+  end
+
+  describe "#reload" do
+    it "should reset the options set to an empty set and then perform a normal additive load" do
+      @config_store.load() do |c|
+        c['big'] = 'dog'
+      end
+
+      @config_store.options.should == { 'big' => 'dog' }
+
+      @config_store.reload() do |c|
+        c['albino'] = 'zebra'
+      end
+
+      @config_store.options.should == { 'albino' => 'zebra' }
+    end
+  end
+
+  describe "hash style getter" do
+    it "should return the value of the option with the given key" do
+      @config_store.load() do |c|
+        c['test_getter'] = 'winning'
+      end
+
+      @config_store['test_getter'].should == 'winning'
+    end
+
+    it "should raise Octopusci::ConfigStore::MissingConfigField if try to get a key that doesn't exist" do
+      lambda { @config_store['blowup'] }.should raise_error(Octopusci::ConfigStore::MissingConfigField)
+    end
+  end
+
+  describe "hash style setter" do
+    it "should set the value of the option with the given key to the given value" do
+      @config_store['test_setter'] = 'bi-winning'
+      @config_store.options.should == { 'test_setter' => 'bi-winning' }
+    end
+  end
+
+  describe "method style getter" do
+    it "should return the value of the option with the give key as the method name" do
+      @config_store.load() do |c|
+        c['pirate'] = 'hords'
+      end
+
+      @config_store.pirate.should == 'hords'
+    end
+
+    it "should raise Octopusci::ConfigStore::MissingConfigField if try to get a key that doesn't exist" do
+      lambda { @config_store.hippy }.should raise_error(Octopusci::ConfigStore::MissingConfigField)
+    end
+  end
+
+  describe "method style setter" do
+    it "should set the value of the option with the given key as the method name to the given value" do
+      @config_store.ship = 'it'
+
+      @config_store.options.should == { 'ship' => 'it' }
+    end
+  end
+
+  describe "#has_key?" do
+    it "should return a boolean value indicating whether or not there is an option in the option set with the given key" do
+      @config_store['foo'] = 1
+
+      @config_store.has_key?('foo').should be_true
+      @config_store.has_key?('bar').should be_false
+    end
+  end
+
+  describe "#after_load" do
+    it "should set the after load callback when given a block" do
+      @config_store.after_load do
+        @config_store['after_load_cb_test'] = 'wootwoot'
+      end
+
+      @config_store.options.should == {}
+
+      @config_store.load() do |c|
+        @config_store['feet'] = 'wet'
+      end
+
+      @config_store.options.should == { 'feet' => 'wet', 'after_load_cb_test' => 'wootwoot' }
+    end
+
+    it "should execute the after load callback when NOT given a block and the callback has been previously set" do
+      @config_store.after_load do
+        @config_store['after_load_cb_test'] = 'wootwoot'
+      end
+
+      @config_store.load() do |c|
+        @config_store['feet'] = 'wet'
+      end
+
+      @config_store.options.should == { 'feet' => 'wet', 'after_load_cb_test' => 'wootwoot' }
+    end
+  end
+end

data/spec/lib/octopusci/io_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe Octopusci::IO do
+  describe "#initialize" do
+    it "should construct an instance of Octopusci::IO" do
+      job = stub('job')
+      Octopusci::IO.new(job).should be_a(Octopusci::IO)
+    end
+  end
+
+  describe "#read_all_out" do
+    it "should open the output file if it exists" do
+      file = stub('file').as_null_object
+      File.stub(:exists?).and_return(true)
+      File.should_receive(:open).and_return(file)
+      Octopusci::IO.new({ 'id' => 23 }).read_all_out
+    end
+
+    it "should return all the file content if the output file exists" do
+      file = stub('file', :read => 'file content', :close => 0)
+      File.stub(:exists?).and_return(true)
+      File.stub(:open).and_return(file)
+      Octopusci::IO.new({ 'id' => 23 }).read_all_out.should == 'file content'
+    end
+
+    it "should return an empty string if the file does not exist" do
+      File.stub(:exists?).and_return(false)
+      Octopusci::IO.new({ 'id' => 23 }).read_all_out.should == ""
+    end
+  end
+
+  describe "#read_all_log" do
+    it "should open the log file if it exists" do
+      file = stub('file').as_null_object
+      File.stub(:exists?).and_return(true)
+      File.should_receive(:open).and_return(file)
+      Octopusci::IO.new({ 'id' => 23 }).read_all_log
+    end
+
+    it "should return all the file content if the log file exists" do
+      file = stub('file', :read => 'file content')
+      File.stub(:exists?).and_return(true)
+      File.stub(:open).and_return(file)
+      Octopusci::IO.new({ 'id' => 23 }).read_all_log.should == 'file content'
+    end
+
+    it "should return an empty string if the file does not exist" do
+      File.stub(:exists?).and_return(false)
+      Octopusci::IO.new({ 'id' => 23 }).read_all_log.should == ""
+    end
+  end
+
+  describe "#open_log_for_writing" do
+  end
+
+  describe "#open_out_for_writing" do
+  end
+
+  describe "#puts" do
+  end
+
+  describe "#log" do
+  end
+end