ci_in_a_can 0.0.8 → 0.0.9

data/bin/ciinacan

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

data/lib/ci_in_a_can/app.rb

@@ -1,6 +1,4 @@
 require 'sinatra/base'
-require 'json'
-require 'uuid'
 
 module CiInACan
 
@@ -11,6 +9,7 @@ module CiInACan
     end
 
     get '/test_result/:id' do
+      CiInACan.results_location = '/Users/darrencauthon/desktop/ci_in_a_can/spec/temp'
       CiInACan::TestResult.find(params[:id]).to_json
     end
 

data/lib/ci_in_a_can/bash.rb

@@ -3,10 +3,8 @@ module CiInACan
   module Bash
 
     def self.run command
-      result = CiInACan::BashResult.new
-      result.output    = backtick command
-      result.exit_code = the_exit_code
-      result
+      CiInACan::BashResult.new(output:    backtick(command),
+                               exit_code: the_exit_code)
     end
 
     def self.backtick command

data/lib/ci_in_a_can/bash_result.rb

@@ -2,6 +2,8 @@ module CiInACan
 
   class BashResult
 
+    params_constructor
+
     attr_accessor :exit_code, :output
 
     def successful

data/lib/ci_in_a_can/build.rb

@@ -1,21 +1,13 @@
 module CiInACan
 
   class Build
+    params_constructor
 
-    attr_accessor :git_ssh, :local_location, :repo, :sha
-    attr_accessor :id
+    attr_accessor :id, :git_ssh, :sha,
+                  :local_location, :repo
 
     def self.parse content
-      data = JSON.parse content
-      data['payload'] = JSON.parse data['payload']
-
-      splat = data['payload']['compare'].split('/')
-
-      build = self.new
-      build.git_ssh = "git@github.com:#{splat[3]}/#{splat[4]}.git"
-      build.repo    = "#{splat[3]}/#{splat[4]}"
-      build.sha     = data['payload']['head_commit']['id']
-      build
+      GithubBuildParser.new.parse content
     end
 
     def commands

data/lib/ci_in_a_can/cloner.rb

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

data/lib/ci_in_a_can/daemon.rb

@@ -1,10 +1,15 @@
 module CiInACan
+
   module Daemon
+
     def self.start options
       CiInACan.site_url = options[:site_url]
       CiInACan::Github.access_token = options[:access_token]
       CiInACan::Watcher.watch options[:watching_location], options[:working_location]
+
       sleep
     end
+
   end
+
 end

data/lib/ci_in_a_can/github.rb

@@ -5,24 +5,34 @@ module CiInACan
   module Github
 
     class << self
-      
       attr_accessor :access_token
+    end
 
-      def client
-        return nil if access_token.to_s == ''
-        Octokit::Client.new access_token: access_token
-      end
+    def self.client
+      return nil if access_token.to_s == ''
+      Octokit::Client.new(access_token: access_token)
+    end
 
-      def report_pending_status_for build
-        return nil unless client
-        client.create_status build.repo, build.sha, 'pending'
-      end
+    def self.report_pending_status_for build
+      return nil unless client
+      client.create_status build.repo, build.sha, 'pending'
+    end
 
-      def report_complete_status_for build, test_result
-        return nil unless client
-        client.create_status(build.repo, build.sha, (test_result.passed ? 'success' : 'failure'), { target_url: "#{CiInACan.site_url}/test_result/#{test_result.id}" } )
-      end
+    def self.report_complete_status_for build, test_result
+      return nil unless client
+      client.create_status(build.repo, build.sha, 
+                           complete_status_from(test_result), 
+                           { target_url: target_url_for(test_result) } )
+    end
+
+    private
+
+    def self.target_url_for test_result
+      "#{CiInACan.site_url}/test_result/#{test_result.id}"
+    end
 
+    def self.complete_status_from test_result
+      (test_result.passed ? 'success' : 'failure')
     end
 
   end

data/lib/ci_in_a_can/github_build_parser.rb

@@ -0,0 +1,36 @@
+module CiInACan
+
+  class GithubBuildParser
+
+    def parse content
+      payload = extract_payload_from content
+      project = extract_repo_from payload
+
+      CiInACan::Build.new(git_ssh: "git@github.com:#{project}.git",
+                          repo:    project,
+                          sha:     extract_sha_from(payload))
+    end
+
+    private
+
+    def extract_repo_from payload
+      username, project_name = get_username_and_project_name_from payload
+      "#{username}/#{project_name}"
+    end
+
+    def extract_payload_from content
+      data = JSON.parse content
+      JSON.parse data['payload']
+    end
+
+    def get_username_and_project_name_from payload
+      splat = payload['compare'].split('/')
+      [splat[3], splat[4]]
+    end
+
+    def extract_sha_from payload
+      payload['head_commit']['id']
+    end
+
+  end
+end

data/lib/ci_in_a_can/runner.rb

@@ -3,10 +3,28 @@ module CiInACan
   module Runner
 
     def self.run build
+      report_pending_status_for build
+      clone_a_local_copy_of build
+      test_results = run_the_tests_for build
+      send_notifications_for build, test_results
+    end
+
+    private
+
+    def self.send_notifications_for build, test_results
+      CiInACan::TestResultNotifier.send_for build, test_results
+    end
+
+    def self.run_the_tests_for build
+      CiInACan::TestRunner.run_tests_for build
+    end
+
+    def self.report_pending_status_for build
       CiInACan::Github.report_pending_status_for build
+    end
+
+    def self.clone_a_local_copy_of build
       CiInACan::Cloner.clone_a_local_copy_for build
-      test_results = CiInACan::TestRunner.run_tests_for build
-      CiInACan::TestResultNotifier.send_for build, test_results
     end
 
   end

data/lib/ci_in_a_can/test_result.rb

@@ -1,20 +1,35 @@
-require 'subtle'
-
 module CiInACan
   class TestResult
+
+    PERSISTENCE_TYPE = 'test_result'
+
     params_constructor
+
     attr_accessor :id
     attr_accessor :passed, :output
 
     def self.create values
-      test_result = self.new values
-      test_result.id = UUID.new.generate
-      CiInACan::Persistence.save "test_result", test_result.id, test_result
+      test_result = create_the_test_result_from values
+      save_this test_result
       test_result
     end
 
     def self.find id
-      CiInACan::Persistence.find "test_result", id
+      CiInACan::Persistence.find PERSISTENCE_TYPE, id
+    end
+
+    def to_json
+      { id: id, passed: passed, output: output }.to_json
+    end
+
+    private
+
+    def self.create_the_test_result_from values
+      self.new values.merge(id: UUID.new.generate)
+    end
+
+    def self.save_this test_result
+      CiInACan::Persistence.save PERSISTENCE_TYPE, test_result.id, test_result
     end
   end
 end

data/lib/ci_in_a_can/test_result_notifier.rb

@@ -1,7 +1,17 @@
 module CiInACan
+
   module TestResultNotifier
+
     def self.send_for build, test_result
+      report_results_to_github build, test_result
+    end
+
+    private
+
+    def self.report_results_to_github build, test_result
       CiInACan::Github.report_complete_status_for build, test_result
     end
+
   end
+
 end

data/lib/ci_in_a_can/test_runner.rb

@@ -1,13 +1,27 @@
 module CiInACan
+
   module TestRunner
+
     def self.run_tests_for build
-      commands = ["cd #{build.local_location}"]
-      build.commands.each { |c| commands << c }
+      bash_result = run get_commands_for(build)
+      build_test_result_from bash_result
+    end
 
-      bash_result = CiInACan::Bash.run commands.join('; ')
+    private
 
+    def self.build_test_result_from bash_result
       CiInACan::TestResult.create( { passed: bash_result.successful,
-                                     output: bash_result.output      } )
+                                     output: bash_result.output } )
+    end
+
+    def self.run commands
+      CiInACan::Bash.run commands.join('; ')
     end
+
+    def self.get_commands_for build
+      ["cd #{build.local_location}", build.commands].flatten
+    end
+
   end
+
 end

data/lib/ci_in_a_can/version.rb

@@ -1,3 +1,3 @@
 module CiInACan
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/ci_in_a_can/watcher.rb

@@ -1,5 +1,4 @@
 require 'listen'
-require 'json'
 
 module CiInACan
 
@@ -19,17 +18,22 @@ module CiInACan
       end
 
       def build_callback working_location
-        Proc.new do |modified, added, removed|
-          next unless added.count > 0
+        Proc.new do |_, new_files, _|
+          next unless new_files.count > 0
 
-          build = CiInACan::Build.parse File.read(added.first)
-          build.id = UUID.new.generate
-          build.local_location = "#{working_location}/#{build.id}"
+          build = create_a_build_for(new_files.first, working_location)
 
           Runner.run build
         end
       end
 
+      def create_a_build_for file, working_location
+        build = CiInACan::Build.parse File.read(file)
+        build.id = UUID.new.generate
+        build.local_location = "#{working_location}/#{build.id}"
+        build
+      end
+
     end
 
   end

data/lib/ci_in_a_can.rb

@@ -1,3 +1,5 @@
+require 'json'
+require 'uuid'
 require 'subtle'
 
 require_relative "ci_in_a_can/version"

data/spec/ci_in_a_can/build_spec.rb

@@ -9,37 +9,17 @@ describe CiInACan::Build do
     result[1].must_equal 'bundle exec rake'
   end
 
-  [:compare, :sha, :git_ssh, :repo].to_objects {[
-    ["https://github.com/darrencauthon/ci_in_a_can/commit/b1c5f9c9588f", "qwe", "git@github.com:darrencauthon/ci_in_a_can.git", "darrencauthon/ci_in_a_can"],
-    ["https://github.com/abc/123/commit/b1c5f9c9588f",                   "uio", "git@github.com:abc/123.git",                   "abc/123"]
-  ]}.each do |test|
-
-    describe "parse" do
-
-      let(:content) do
-        {
-          payload: {
-                     compare:     test.compare,
-                     head_commit: { id: test.sha }
-                   }.to_json
-        }.to_json
-      end
-
-      it "should convert the http to a git ssh" do
-        build = CiInACan::Build.parse content
-        build.git_ssh.must_equal test.git_ssh
-      end
-
-      it "should return the repo" do
-        build = CiInACan::Build.parse content
-        build.repo.must_equal test.repo
-      end
-
-      it "should stamp the sha" do
-        build = CiInACan::Build.parse content
-        build.sha.must_equal test.sha
-      end
+  describe "parse" do
 
+    it "should return the result of the Github parser" do
+      content = Object.new
+      parser  = Object.new
+      build   = Object.new
+
+      parser.stubs(:parse).with(content).returns build
+      CiInACan::GithubBuildParser.stubs(:new).returns parser
+
+      CiInACan::Build.parse(content).must_be_same_as build
     end
 
   end

data/spec/ci_in_a_can/github_build_parser_spec.rb

@@ -0,0 +1,41 @@
+require_relative '../spec_helper'
+
+describe CiInACan::GithubBuildParser do
+
+  [:compare, :sha, :git_ssh, :repo].to_objects {[
+    ["https://github.com/darrencauthon/ci_in_a_can/commit/b1c5f9c9588f", "qwe", "git@github.com:darrencauthon/ci_in_a_can.git", "darrencauthon/ci_in_a_can"],
+    ["https://github.com/abc/123/commit/b1c5f9c9588f",                   "uio", "git@github.com:abc/123.git",                   "abc/123"]
+  ]}.each do |test|
+
+    describe "parse" do
+
+      let(:content) do
+        {
+          payload: {
+                     compare:     test.compare,
+                     head_commit: { id: test.sha }
+                   }.to_json
+        }.to_json
+      end
+
+      it "should convert the http to a git ssh" do
+        build = CiInACan::GithubBuildParser.new.parse content
+        build.git_ssh.must_equal test.git_ssh
+      end
+
+      it "should return the repo" do
+        build = CiInACan::GithubBuildParser.new.parse content
+        build.repo.must_equal test.repo
+      end
+
+      it "should stamp the sha" do
+        build = CiInACan::GithubBuildParser.new.parse content
+        build.sha.must_equal test.sha
+      end
+
+    end
+
+  end
+
+end
+

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: ci_in_a_can
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
+  prerelease: 
 platform: ruby
 authors:
 - Darren Cauthon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,155 +30,177 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: subtle
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: contrast
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: subtle
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Fast CI. Still a WIP.
@@ -193,7 +218,6 @@ files:
 - Rakefile
 - bin/ciinacan
 - ci_in_a_can.gemspec
-- config.ru
 - lib/ci_in_a_can.rb
 - lib/ci_in_a_can/app.rb
 - lib/ci_in_a_can/bash.rb
@@ -202,6 +226,7 @@ files:
 - lib/ci_in_a_can/cloner.rb
 - lib/ci_in_a_can/daemon.rb
 - lib/ci_in_a_can/github.rb
+- lib/ci_in_a_can/github_build_parser.rb
 - lib/ci_in_a_can/persistence.rb
 - lib/ci_in_a_can/runner.rb
 - lib/ci_in_a_can/test_result.rb
@@ -214,6 +239,7 @@ files:
 - spec/ci_in_a_can/bash_spec.rb
 - spec/ci_in_a_can/build_spec.rb
 - spec/ci_in_a_can/cloner_spec.rb
+- spec/ci_in_a_can/github_build_parser_spec.rb
 - spec/ci_in_a_can/github_spec.rb
 - spec/ci_in_a_can/runner_spec.rb
 - spec/ci_in_a_can/test_result_notifier_spec.rb
@@ -225,32 +251,40 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1243882280261005315
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1243882280261005315
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Fast CI. Still a WIP.
 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/cloner_spec.rb
+- spec/ci_in_a_can/github_build_parser_spec.rb
 - spec/ci_in_a_can/github_spec.rb
 - spec/ci_in_a_can/runner_spec.rb
 - spec/ci_in_a_can/test_result_notifier_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 370913ef96b0b8ea7bad7d243a2ef57c3bc0c961
-  data.tar.gz: da919a87438e340c1b0efe14351f7ee66bd120c0
-SHA512:
-  metadata.gz: 5933778ec97dd4577df453bae506f08e08d543e579a0fc2ac09705bd04b2e9ec6bae3f8c61344844f5b6c7e76160734df50b3024d3543091b93b2327d0fea9d4
-  data.tar.gz: 6d59e751e7e9937dc19068cba66a215086f34858897ed35edd8853576bc16490b7db05cf99d289baef4139b2f6a4d1fd27c16185f6f3464e7da608c1f2f56fde

data/config.ru

@@ -1,6 +0,0 @@
-require_relative 'lib/ci_in_a_can'
-
-CiInACan::App.jobs_location = "jobs"
-
-use CiInACan::App
-run Sinatra::Application