ci_in_a_can 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec408de18d9c47e09339a8c2ed0bc8453a42a039
-  data.tar.gz: cb23d747865712a372931f1a558fee78f618bf95
+  metadata.gz: 4ae03b9e39da688340553f31bb593eaf46892635
+  data.tar.gz: feb268bfb18a9d8f60776987d922b5846bd3d57f
 SHA512:
-  metadata.gz: 8475a583069b024c3460c151fdbc30b0f404072936784378a9be2076eb19a25b6acfbf03601b551497914adc154085c00afbbf2744140113beaf5304c31d2d4d
-  data.tar.gz: fe8538c757f0d30cb4da661c083e06285a031d0a5a9563c891c63f0060d7dc582797fe85fcc800f921676b7190b9f24bb2c0d6e90f5c28950aa8f9090fdebe7f
+  metadata.gz: a87f02275b1d2ab4bb3777eea044ba3d8d84fa8e4eee08688e278ef24dfec0f3c25ee65a9700f0328225a175d2f753d8899e9df7420f62dfbb95dd171c0ebfc3
+  data.tar.gz: e84daf4eb367ac55b6cb392542472378ad70532e0d56db755f961c881e50cb0a26a53d4ef6aeedb6cbb6736919fa7a2b7c1d046be5ddf16646fb59b072d19c54

data/lib/ci_in_a_can/cleaner.rb

@@ -0,0 +1,7 @@
+module CiInACan
+  module Cleaner
+    def self.remove_local_copy_of build
+      CiInACan::Bash.run "rm -rf \"#{build.local_location}\""
+    end
+  end
+end

data/lib/ci_in_a_can/cli/files.rb

@@ -51,10 +51,10 @@ require 'ci_in_a_can'
 
 this_directory = File.expand_path(File.dirname(__FILE__) + '/../')
 
-eval("CiInACan::App.jobs_location = '\#{this_directory}' + '/jobs'")
+eval("CiInACan::Web.jobs_location = '\#{this_directory}' + '/jobs'")
 eval("CiInACan.results_location = '\#{this_directory}' + '/results'")
 
-use CiInACan::App
+use CiInACan::Sinatra
 run Sinatra::Application
 EOF
       end

data/lib/ci_in_a_can/cloner.rb

@@ -3,13 +3,17 @@ module CiInACan
   module Cloner
 
     def self.clone_a_local_copy_for build
-      CiInACan::Bash.run commands_to_run_for(build).join('; ')
+      execute the_commands_to_clone_the(build)
     end
 
-    def self.commands_to_run_for build
+    def self.execute command
+      CiInACan::Bash.run command
+    end
+
+    def self.the_commands_to_clone_the build
       ["git clone #{build.git_ssh} #{build.local_location}",
        "cd #{build.local_location}",
-       "git checkout #{build.sha}"]
+       "git checkout #{build.sha}"].join('; ')
     end
 
   end

data/lib/ci_in_a_can/runner.rb

@@ -6,6 +6,7 @@ module CiInACan
       report_pending_status_for build
       clone_a_local_copy_of build
       test_results = run_the_tests_for build
+      CiInACan::Cleaner.remove_local_copy_of build
       send_notifications_for build, test_results
     end
 

data/lib/ci_in_a_can/sinatra.rb

@@ -0,0 +1,64 @@
+require 'sinatra/base'
+
+module CiInACan
+
+  class Sinatra < Sinatra::Base
+
+    enable :sessions
+
+    get '/' do
+              html = CiInACan::Web.new.show_a_list_of_the_runs
+              CiInACan::WebContent.layout_page_around html
+            end
+
+    get '/login' do
+                   html = CiInACan::Web.new.login_page
+                   CiInACan::WebContent.layout_page_around html
+                 end
+
+    post '/login' do
+                    CiInACan::Web.new(params: params, session: session)
+                      .submit_a_passphrase
+                    redirect '/'
+                  end
+
+    get '/test_result/:id' do
+                             html = CiInACan::Web.new(params: params)
+                                      .show_the_test_result
+                             CiInACan::WebContent.layout_page_around html
+                           end
+
+    get '/test_result/:id.json' do
+                                  CiInACan::Web.new(params: params)
+                                    .show_the_test_result_in_json
+                                end
+
+    get %r{/repo/(.+)} do
+                         web = CiInACan::Web.new(params: params, session: session)
+
+                         unless web.logged_in?
+                           redirect '/login'
+                           return
+                         end
+
+                         html = web.show_the_repo_edit_form
+                         CiInACan::WebContent.layout_page_around html
+                       end
+
+    post %r{/repo/(.+)} do
+                          web = CiInACan::Web.new(params: params, session: session)
+                          unless web.logged_in?
+                            redirect '/login'
+                            return
+                          end
+                          repo = web.update_repo_details
+                          redirect "/repo/#{repo.id}"
+                        end
+
+    post %r{/push/(.+)} do
+                          CiInACan::Web.new(params: params).start_a_new_build
+                        end
+
+  end
+
+end

data/lib/ci_in_a_can/version.rb

@@ -1,3 +1,3 @@
 module CiInACan
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

data/lib/ci_in_a_can/view_models/a_list_of_runs.rb

@@ -6,8 +6,6 @@ module CiInACan
 
       def to_html
         run_html = the_original_value.map { |r| r.to_html }.join("\n")
-
-        CiInACan::WebContent.full_page_of(
 <<EOF
     <table class="table table-bordered">
       <tbody>
@@ -15,7 +13,6 @@ module CiInACan
       </tbody>
     </table>
 EOF
-)
       end
 
     end

data/lib/ci_in_a_can/view_models/login_form.rb

@@ -5,7 +5,6 @@ module CiInACan
     class LoginForm < ViewModel
 
       def to_html
-        CiInACan::WebContent.full_page_of(
 <<EOF
 <form action="/login" method="post">
 Passphrase
@@ -13,7 +12,6 @@ Passphrase
 <button type="submit">Submit</button>
 </form>
 EOF
-)
       end
 
     end

data/lib/ci_in_a_can/view_models/repo_form.rb

@@ -5,7 +5,6 @@ module CiInACan
     class RepoForm < ViewModel
 
       def to_html
-        CiInACan::WebContent.full_page_of(
 <<EOF
 <form action="/repo/#{id}" method="post">
 <div>#{url}</div>
@@ -15,7 +14,6 @@ module CiInACan
 <input type="submit">Submit</input>
 </form>
 EOF
-)
       end
 
     end

data/lib/ci_in_a_can/web.rb

@@ -46,7 +46,7 @@ module CiInACan
 
     def show_the_test_result
       test_result = CiInACan::TestResult.find(params[:id])
-      CiInACan::WebContent.full_page_of test_result.to_html
+      test_result.to_html
     end
 
     def update_repo_details

data/lib/ci_in_a_can/web_content.rb

@@ -2,7 +2,7 @@ module CiInACan
 
   module WebContent
 
-    def self.full_page_of content
+    def self.layout_page_around content
 <<EOF
 <html>
   <head>

data/spec/ci_in_a_can/cleaner_spec.rb

@@ -0,0 +1,23 @@
+require_relative '../spec_helper'
+
+describe CiInACan::Cleaner do
+
+  describe "removing a local copy of a build" do
+
+    ['a', 'b'].each do |local_location|
+
+      describe "different locations" do
+
+        it "should exist" do
+          build = CiInACan::Build.new(local_location: local_location)
+          CiInACan::Bash.expects(:run).with("rm -rf \"#{local_location}\"")
+          CiInACan::Cleaner.remove_local_copy_of build
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/ci_in_a_can/runner_spec.rb

@@ -11,6 +11,7 @@ describe CiInACan::Runner do
       CiInACan::Cloner.stubs(:clone_a_local_copy_for)
       CiInACan::TestRunner.stubs(:run_tests_for)
       CiInACan::TestResultNotifier.stubs(:send_for)
+      CiInACan::Cleaner.stubs(:remove_local_copy_of)
     end
 
     it "should clone the git repo" do
@@ -22,6 +23,11 @@ describe CiInACan::Runner do
       CiInACan::TestRunner.expects(:run_tests_for).with build
       CiInACan::Runner.run build
     end
+    
+    it "should cleanup after itself" do
+      CiInACan::Cleaner.expects(:remove_local_copy_of).with build
+      CiInACan::Runner.run build
+    end
 
     it "should run the test after the clone" do
       count = 0
@@ -31,6 +37,14 @@ describe CiInACan::Runner do
       CiInACan::Runner.run build
     end
 
+    it "should cleanup after the test results are retrieved" do
+      count = 0
+      CiInACan::TestRunner.stubs(:run_tests_for).with { count += 1 }
+      CiInACan::Cleaner.stubs(:remove_local_copy_of).with { count.must_equal 1; true }
+
+      CiInACan::Runner.run build
+    end
+
     it "should call the test result notifier with the build and the results" do
       test_results = Object.new
       CiInACan::TestRunner.stubs(:run_tests_for).with(build).returns test_results

data/spec/ci_in_a_can/web_spec.rb

@@ -47,7 +47,6 @@ describe CiInACan::Web do
 
       params[:id] = Object.new
       test_result = Object.new
-      web_content = Object.new
       html        = Object.new
 
       test_result.stubs(:to_html).returns html
@@ -56,13 +55,9 @@ describe CiInACan::Web do
                           .with(params[:id])
                           .returns test_result
 
-      CiInACan::WebContent.stubs(:full_page_of)
-                          .with(html)
-                          .returns web_content
-
       result = web.show_the_test_result
 
-      result.must_be_same_as web_content
+      result.must_be_same_as html
 
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci_in_a_can
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Darren Cauthon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -227,10 +227,10 @@ files:
 - bin/ciinacan
 - ci_in_a_can.gemspec
 - lib/ci_in_a_can.rb
-- lib/ci_in_a_can/app.rb
 - lib/ci_in_a_can/bash.rb
 - lib/ci_in_a_can/bash_result.rb
 - lib/ci_in_a_can/build.rb
+- lib/ci_in_a_can/cleaner.rb
 - lib/ci_in_a_can/cli.rb
 - lib/ci_in_a_can/cli/files.rb
 - lib/ci_in_a_can/cli/structure_builder.rb
@@ -243,6 +243,7 @@ files:
 - lib/ci_in_a_can/repo.rb
 - lib/ci_in_a_can/run.rb
 - lib/ci_in_a_can/runner.rb
+- lib/ci_in_a_can/sinatra.rb
 - lib/ci_in_a_can/test_result.rb
 - lib/ci_in_a_can/test_result_notifier.rb
 - lib/ci_in_a_can/test_runner.rb
@@ -260,6 +261,7 @@ files:
 - spec/ci_in_a_can/bash_result_spec.rb
 - spec/ci_in_a_can/bash_spec.rb
 - spec/ci_in_a_can/build_spec.rb
+- spec/ci_in_a_can/cleaner_spec.rb
 - spec/ci_in_a_can/cli/structure_builder_spec.rb
 - spec/ci_in_a_can/cli_spec.rb
 - spec/ci_in_a_can/cloner_spec.rb
@@ -304,6 +306,7 @@ test_files:
 - spec/ci_in_a_can/bash_result_spec.rb
 - spec/ci_in_a_can/bash_spec.rb
 - spec/ci_in_a_can/build_spec.rb
+- spec/ci_in_a_can/cleaner_spec.rb
 - spec/ci_in_a_can/cli/structure_builder_spec.rb
 - spec/ci_in_a_can/cli_spec.rb
 - spec/ci_in_a_can/cloner_spec.rb

data/lib/ci_in_a_can/app.rb

@@ -1,67 +0,0 @@
-require 'sinatra/base'
-
-module CiInACan
-
-  class App < Sinatra::Base
-
-    enable :sessions
-
-    before do
-      session[:authenticated] = session[:passphrase] == ENV['PASSPHRASE'].to_s
-    end
-
-    class << self
-      attr_accessor :jobs_location
-    end
-
-    get '/login' do
-      CiInACan::Web.new.login_page
-    end
-
-    post '/login' do
-      web = CiInACan::Web.new(params: params, session: session)
-      web.submit_a_passphrase
-      redirect '/'
-    end
-
-    get '/test_result/:id.json' do
-      CiInACan::Web.new(params: params).show_the_test_result_in_json
-    end
-
-    post %r{/repo/(.+)} do
-
-      web = CiInACan::Web.new(params: params, session: session)
-      unless web.logged_in?
-        redirect '/login'
-        return
-      end
-      repo = web.update_repo_details
-      redirect "/repo/#{repo.id}"
-    end
-
-    get %r{/repo/(.+)} do
-      web = CiInACan::Web.new(params: params, session: session)
-
-      unless web.logged_in?
-        redirect '/login'
-        return
-      end
-
-      web.show_the_repo_edit_form
-    end
-
-    get '/test_result/:id' do
-      CiInACan::Web.new(params: params).show_the_test_result
-    end
-
-    get '/' do
-      CiInACan::Web.new.show_a_list_of_the_runs
-    end
-
-    post %r{/push/(.+)} do
-      CiInACan::Web.new(params: params).start_a_new_build
-    end
-
-  end
-
-end