citrus-core 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb11322dec0a84ab1f72b581194f927e7514e01
-  data.tar.gz: 25db9393f02e6b1451706edd8b27460a44634f92
+  metadata.gz: e337f6fe4503cd22f913b58c3b405349b2095502
+  data.tar.gz: 8ab789326e014e9b37f08786751fa69a6fc0c35f
 SHA512:
-  metadata.gz: 1b32d90ae4f2d5f830f57c24d18880050b5fd652224c3a37372f9b99d418ace48318fcc37f1e0cab972685600d7e9ceeed9e99edbd31d5637566da10a0be2109
-  data.tar.gz: ee4ce1f0ca35d4b40dd979123866ab6e20bfb82f3a8dff1b5a9073a4ea01afab5ac4076d7c96e9d2f6329b50abd15be4efdc6972ced75442f43979e438871611
+  metadata.gz: 9d375c55555d424fb8c3449180e037aecdb394dbaf8b6300648b354c8665c8b0f2e600fc59d2e5ef161e943b82ee34bc60b077fbaf0665dbccf05b26d8f4651c
+  data.tar.gz: 55c5b6cee6ee95852d10395bef0b88a2f510e115e08d7bb6eccb12b727bc67d45329899842c1d4b73f486da7c3c1f3f0fefdf9c1484ab762c5b739bac12bf08c

data/.citrus/config.rb

@@ -1,3 +1,3 @@
 Citrus::Configuration.describe do |c|
-  c.build_script = "rspec"
+  c.build_script = 'rspec'
 end

data/.gitignore

@@ -6,7 +6,6 @@
 Gemfile.lock
 InstalledFiles
 _yardoc
-coverage
 doc/
 lib/bundler/man
 pkg
@@ -19,3 +18,5 @@ bin
 .ruby-version
 cache
 builds
+coverage
+.coveralls.yml

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
-script: bundle exec rspec
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - rbx-19mode
-  - jruby-19mode
-
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode
+    - rvm: jruby-19mode

data/README.md

@@ -1,6 +1,6 @@
 ## Citrus Core
 
-[![Build Status](https://secure.travis-ci.org/pawelpacana/citrus-core.png)](http://travis-ci.org/pawelpacana/citrus-core) [![Dependency Status](https://gemnasium.com/pawelpacana/citrus-core.png)](https://gemnasium.com/pawelpacana/citrus-core) [![Code Climate](https://codeclimate.com/github/pawelpacana/citrus-core.png)](https://codeclimate.com/github/drugpl/bbq) [![Gem Version](https://badge.fury.io/rb/citrus-core.png)](http://badge.fury.io/rb/citrus-core)
+[![Build Status](https://secure.travis-ci.org/pawelpacana/citrus-core.png)](http://travis-ci.org/pawelpacana/citrus-core) [![Dependency Status](https://gemnasium.com/pawelpacana/citrus-core.png)](https://gemnasium.com/pawelpacana/citrus-core) [![Code Climate](https://codeclimate.com/github/pawelpacana/citrus-core.png)](https://codeclimate.com/github/pawelpacana/citrus-core) [![Gem Version](https://badge.fury.io/rb/citrus-core.png)](http://badge.fury.io/rb/citrus-core) [![Coverage Status](https://coveralls.io/repos/pawelpacana/citrus-core/badge.png)](https://coveralls.io/r/pawelpacana/citrus-core)
 
 Spartan CI environment. Watch it build itself:
 

data/Rakefile

@@ -1,9 +1,6 @@
 require 'bundler/gem_tasks'
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 
-Rake::TestTask.new do |t|
-  t.libs    = %w(lib test)
-  t.pattern = 'test/*_test.rb'
-end
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :test
+task :default => :spec

data/citrus-core.gemspec

@@ -19,7 +19,9 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'childprocess', '~> 0.3.9'
 
-  gem.add_development_dependency 'fakefs', '~> 0.4.2'
   gem.add_development_dependency 'rspec',  '~> 2.13'
-  gem.add_development_dependency 'bogus',  '~> 0.0.4'
+  gem.add_development_dependency 'bogus',  '~> 0.1'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'mutant', '~> 0.3.0.rc3'
+  gem.add_development_dependency 'coveralls', '~> 0.7'
 end

data/examples/bootstrap.rb

@@ -1,12 +1,13 @@
 require 'citrus/core'
 require 'pathname'
+require 'tmpdir'
 
-class Notifier
-  def build_succeeded(build, output)
+class EventSubscriber
+  def build_succeeded(build, result)
     puts "[#{build.uuid}] Build has succeeded."
   end
 
-  def build_failed(build, output)
+  def build_failed(build, result)
     puts "[#{build.uuid}] Build has failed."
   end
 
@@ -18,23 +19,22 @@ class Notifier
     puts "[#{build.uuid}] Build has started."
   end
 
-  def output_received(data)
+  def build_output_received(build, data)
     print data
   end
 end
 
-include Citrus::Core
-
-payload = Pathname.new(File.dirname(__FILE__)).join('payload.json').read
-changeset = GithubAdapter.new.create_changeset_from_push_data(payload)
-build = Build.new(changeset)
-workspace_builder = WorkspaceBuilder.new
-configuration_loader = ConfigurationLoader.new
-test_runner = TestRunner.new
-subscriber = Notifier.new
-test_runner.add_subscriber(subscriber)
-build_service = ExecuteBuildService.new(workspace_builder, configuration_loader, test_runner)
-build_service.add_subscriber(subscriber)
-build_service.start(build)
+world             = Citrus::Core::World.new(Dir.mktmpdir('citrus'))
+github_adapter    = Citrus::Core::GithubAdapter.new
+changeset         = github_adapter.create_changeset_from_push_data(Pathname.new(File.dirname(__FILE__)).join('payload.json').read)
+event_subscriber  = EventSubscriber.new
+code_fetcher      = Citrus::Core::CachedCodeFetcher.new(world.cache_root)
+workspace_builder = Citrus::Core::WorkspaceBuilder.new(world.build_root, code_fetcher)
+config_loader     = Citrus::Core::ConfigurationLoader.new
+test_runner       = Citrus::Core::TestRunner.new
+build_service     = Citrus::Core::ExecuteBuild.new(workspace_builder, config_loader, test_runner)
+
+[test_runner, build_service].each { |publisher| publisher.add_subscriber(event_subscriber) }
+build_service.start(Citrus::Core::Build.new(changeset))
 
 

data/examples/payload.json

@@ -1 +1,128 @@
-{ "after": "1b234fec1196170fa01c7b7d370a8fec7e2e3e61", "before": "646f122aa8fa537f9d05bbcc58712f782ee9d43f", "commits": [ { "added": [], "author": { "email": "pawel.pacana@gmail.com", "name": "Pawe\u0142 Pacana", "username": "pawelpacana" }, "committer": { "email": "pawel.pacana@gmail.com", "name": "Pawe\u0142 Pacana", "username": "pawelpacana" }, "distinct": true, "id": "0332491c0d3b617539c29fa66b0e6316e23b25a2", "message": "Add cache_root global.", "modified": [ ".gitignore", "lib/citrus/core.rb" ], "removed": [], "timestamp": "2013-05-29T15:30:43-07:00", "url": "https://github.com/pawelpacana/citrus-core/commit/0332491c0d3b617539c29fa66b0e6316e23b25a2" }, { "added": [], "author": { "email": "pawel.pacana@gmail.com", "name": "Pawe\u0142 Pacana", "username": "pawelpacana" }, "committer": { "email": "pawel.pacana@gmail.com", "name": "Pawe\u0142 Pacana", "username": "pawelpacana" }, "distinct": true, "id": "cb1eb5365799df518cfcfa4e422aafe06e4b64d5", "message": "Bring git adapter to reality since it did not have spec.", "modified": [ "lib/citrus/core/git_adapter.rb" ], "removed": [], "timestamp": "2013-05-29T15:32:07-07:00", "url": "https://github.com/pawelpacana/citrus-core/commit/cb1eb5365799df518cfcfa4e422aafe06e4b64d5" }, { "added": [ ".citrus/config.rb" ], "author": { "email": "pawel.pacana@gmail.com", "name": "Pawe\u0142 Pacana", "username": "pawelpacana" }, "committer": { "email": "pawel.pacana@gmail.com", "name": "Pawe\u0142 Pacana", "username": "pawelpacana" }, "distinct": true, "id": "1b234fec1196170fa01c7b7d370a8fec7e2e3e61", "message": "Add simplest config to run build from this repository.", "modified": [], "removed": [], "timestamp": "2013-05-29T15:33:17-07:00", "url": "https://github.com/pawelpacana/citrus-core/commit/1b234fec1196170fa01c7b7d370a8fec7e2e3e61" } ], "compare": "https://github.com/pawelpacana/citrus-core/compare/646f122aa8fa...1b234fec1196", "created": false, "deleted": false, "forced": false, "head_commit": { "added": [ ".citrus/config.rb" ], "author": { "email": "pawel.pacana@gmail.com", "name": "Pawe\u0142 Pacana", "username": "pawelpacana" }, "committer": { "email": "pawel.pacana@gmail.com", "name": "Pawe\u0142 Pacana", "username": "pawelpacana" }, "distinct": true, "id": "1b234fec1196170fa01c7b7d370a8fec7e2e3e61", "message": "Add simplest config to run build from this repository.", "modified": [], "removed": [], "timestamp": "2013-05-29T15:33:17-07:00", "url": "https://github.com/pawelpacana/citrus-core/commit/1b234fec1196170fa01c7b7d370a8fec7e2e3e61" }, "pusher": { "email": "pawel.pacana@gmail.com", "name": "pawelpacana" }, "ref": "refs/heads/master", "repository": { "created_at": 1360404806, "fork": false, "forks": 0, "has_downloads": true, "has_issues": true, "has_wiki": true, "id": 8108400, "language": "Ruby", "master_branch": "master", "name": "citrus-core", "open_issues": 0, "owner": { "email": "pawel.pacana@gmail.com", "name": "pawelpacana" }, "private": false, "pushed_at": 1369866841, "size": 220, "stargazers": 1, "url": "https://github.com/pawelpacana/citrus-core", "watchers": 1 } }
+{
+    "after": "d71454f98d4f1ba0c1974838e4883cbee72d4233",
+    "before": "5425bd6d5ebf6c99cf2fbc56db3fab9ce0ed4516",
+    "commits": [
+        {
+            "added": [],
+            "author": {
+                "email": "pawel.pacana@gmail.com",
+                "name": "Pawe\u0142 Pacana",
+                "username": "pawelpacana"
+            },
+            "committer": {
+                "email": "pawel.pacana@gmail.com",
+                "name": "Pawe\u0142 Pacana",
+                "username": "pawelpacana"
+            },
+            "distinct": true,
+            "id": "02a402784a8caf58de5b610afd12388e0325549c",
+            "message": "Move publishing to private methods.\n\nThey make visual clutter and I'd love to see them somewhere else\nso aspects maybe?",
+            "modified": [
+                "lib/citrus/core/execute_build_service.rb"
+            ],
+            "removed": [],
+            "timestamp": "2013-08-11T01:50:27-07:00",
+            "url": "https://github.com/pawelpacana/citrus-core/commit/02a402784a8caf58de5b610afd12388e0325549c"
+        },
+        {
+            "added": [],
+            "author": {
+                "email": "pawel.pacana@gmail.com",
+                "name": "Pawe\u0142 Pacana",
+                "username": "pawelpacana"
+            },
+            "committer": {
+                "email": "pawel.pacana@gmail.com",
+                "name": "Pawe\u0142 Pacana",
+                "username": "pawelpacana"
+            },
+            "distinct": true,
+            "id": "d665af0790d4671626a63e34ea013d5616498e5c",
+            "message": "Pass build to test runner to be more specific about published output.",
+            "modified": [
+                "lib/citrus/core/execute_build_service.rb",
+                "lib/citrus/core/test_runner.rb",
+                "spec/execute_build_service_spec.rb",
+                "spec/test_runner_spec.rb"
+            ],
+            "removed": [],
+            "timestamp": "2013-08-11T02:57:39-07:00",
+            "url": "https://github.com/pawelpacana/citrus-core/commit/d665af0790d4671626a63e34ea013d5616498e5c"
+        },
+        {
+            "added": [],
+            "author": {
+                "email": "pawel.pacana@gmail.com",
+                "name": "Pawe\u0142 Pacana",
+                "username": "pawelpacana"
+            },
+            "committer": {
+                "email": "pawel.pacana@gmail.com",
+                "name": "Pawe\u0142 Pacana",
+                "username": "pawelpacana"
+            },
+            "distinct": true,
+            "id": "d71454f98d4f1ba0c1974838e4883cbee72d4233",
+            "message": "Improve naming.",
+            "modified": [
+                "lib/citrus/core/execute_build_service.rb"
+            ],
+            "removed": [],
+            "timestamp": "2013-08-11T03:24:10-07:00",
+            "url": "https://github.com/pawelpacana/citrus-core/commit/d71454f98d4f1ba0c1974838e4883cbee72d4233"
+        }
+    ],
+    "compare": "https://github.com/pawelpacana/citrus-core/compare/5425bd6d5ebf...d71454f98d4f",
+    "created": false,
+    "deleted": false,
+    "forced": false,
+    "head_commit": {
+        "added": [],
+        "author": {
+            "email": "pawel.pacana@gmail.com",
+            "name": "Pawe\u0142 Pacana",
+            "username": "pawelpacana"
+        },
+        "committer": {
+            "email": "pawel.pacana@gmail.com",
+            "name": "Pawe\u0142 Pacana",
+            "username": "pawelpacana"
+        },
+        "distinct": true,
+        "id": "d71454f98d4f1ba0c1974838e4883cbee72d4233",
+        "message": "Improve naming.",
+        "modified": [
+            "lib/citrus/core/execute_build_service.rb"
+        ],
+        "removed": [],
+        "timestamp": "2013-08-11T03:24:10-07:00",
+        "url": "https://github.com/pawelpacana/citrus-core/commit/d71454f98d4f1ba0c1974838e4883cbee72d4233"
+    },
+    "pusher": {
+        "name": "none"
+    },
+    "ref": "refs/heads/master",
+    "repository": {
+        "created_at": 1360404806,
+        "fork": false,
+        "forks": 0,
+        "has_downloads": true,
+        "has_issues": true,
+        "has_wiki": true,
+        "id": 8108400,
+        "language": "Ruby",
+        "master_branch": "master",
+        "name": "citrus-core",
+        "open_issues": 0,
+        "owner": {
+            "email": "pawel.pacana@gmail.com",
+            "name": "pawelpacana"
+        },
+        "private": false,
+        "pushed_at": 1376217577,
+        "size": 236,
+        "stargazers": 1,
+        "url": "https://github.com/pawelpacana/citrus-core",
+        "watchers": 1
+    }
+}

data/lib/citrus/core.rb

@@ -1,31 +1,17 @@
-require 'pathname'
-
 module Citrus
   module Core
-    class << self
-
-      def build_root
-        @build_root || root.join('builds')
-      end
-
-      def cache_root
-        @cache_root || root.join('cache')
-      end
-
-      def root
-        Pathname.new(File.expand_path('../../', File.dirname(__FILE__)))
-      end
 
-    end
   end
 end
 
+require 'citrus/core/world'
 require 'citrus/core/publisher'
 require 'citrus/core/build'
-require 'citrus/core/test_result'
+require 'citrus/core/exit_code'
 require 'citrus/core/workspace_builder'
 require 'citrus/core/cached_code_fetcher'
 require 'citrus/core/changeset'
+require 'citrus/core/test_output'
 require 'citrus/core/test_runner'
 require 'citrus/core/github_adapter'
 require 'citrus/core/commit'
@@ -34,4 +20,4 @@ require 'citrus/core/configuration'
 require 'citrus/core/configuration_loader'
 require 'citrus/core/configuration_validator'
 require 'citrus/core/git_adapter'
-require 'citrus/core/execute_build_service'
+require 'citrus/core/execute_build'

data/lib/citrus/core/build.rb

@@ -1,14 +1,16 @@
+require 'stringio'
 require 'securerandom'
 
 module Citrus
   module Core
     class Build
 
-      attr_reader :changeset, :uuid
+      attr_reader :changeset, :uuid, :output
 
-      def initialize(changeset, uuid = SecureRandom.uuid)
+      def initialize(changeset, uuid = SecureRandom.uuid, output = TestOutput.new)
         @changeset = changeset
         @uuid      = uuid
+        @output    = output
       end
 
     end

data/lib/citrus/core/cached_code_fetcher.rb

@@ -4,18 +4,19 @@ module Citrus
   module Core
     class CachedCodeFetcher
 
-      attr_reader :cache_root, :vcs_adapter
+      attr_reader :cache_root, :vcs_adapter, :digester
 
-      def initialize(cache_root = Citrus::Core.cache_root, vcs_adapter = GitAdapter.new)
+      def initialize(cache_root, vcs_adapter = GitAdapter.new, digester = Digest::SHA1)
         @cache_root  = cache_root
         @vcs_adapter = vcs_adapter
+        @digester    = digester
       end
 
       def fetch(changeset, destination)
         url  = changeset.repository_url
         head = changeset.head
-        cache_dir = cache_root.join(Digest::SHA1.hexdigest(url))
-        cache_dir.mkpath
+        cache_dir = File.join(cache_root, digester.hexdigest(url))
+        FileUtils.mkpath(cache_dir)
         update_cache(url, cache_dir)
         vcs_adapter.clone_repository(cache_dir, destination)
         vcs_adapter.checkout(destination, head)
@@ -24,7 +25,7 @@ module Citrus
       protected
 
       def update_cache(url, cache_dir)
-        return vcs_adapter.clone_repository(url, cache_dir) unless cache_dir.join('.git').exist?
+        return vcs_adapter.clone_repository(url, cache_dir) if Dir.entries(cache_dir).size == 2
         vcs_adapter.fetch_remote(cache_dir)
         vcs_adapter.reset(cache_dir)
       end

data/lib/citrus/core/configuration_loader.rb

@@ -12,8 +12,8 @@ module Citrus
         @validator = validator
       end
 
-      def load_from_path(pathname)
-        data   = pathname.join('.citrus/config.rb').read
+      def load_from_path(path)
+        data   = File.read(File.join(path, '.citrus/config.rb'))
         config = eval(data)
         raise ConfigurationFileInvalidError unless validator.validate(config)
         config

data/lib/citrus/core/execute_build.rb

@@ -0,0 +1,42 @@
+module Citrus
+  module Core
+    class ExecuteBuild
+      include Publisher
+
+      attr_reader :workspace_builder, :configuration_loader, :test_runner
+
+      def initialize(workspace_builder, configuration_loader = ConfigurationLoader.new, test_runner = TestRunner.new)
+        @workspace_builder    = workspace_builder
+        @configuration_loader = configuration_loader
+        @test_runner          = test_runner
+      end
+
+      def start(build)
+        workspace_path = workspace_builder.create_workspace(build)
+        configuration  = configuration_loader.load_from_path(workspace_path)
+        notify_build_start(build)
+        result = test_runner.start(build, configuration, workspace_path)
+        notify_build_result(build, result)
+      rescue ConfigurationError => error
+        notify_build_abort(build, error)
+        raise
+      end
+
+      protected
+
+      def notify_build_start(build)
+        publish(:build_started, build)
+      end
+
+      def notify_build_result(build, result)
+        publish(:build_succeeded, build, result) if result.success?
+        publish(:build_failed,    build, result) if result.failure?
+      end
+
+      def notify_build_abort(build, error)
+        publish(:build_aborted, build, error)
+      end
+
+    end
+  end
+end

data/lib/citrus/core/exit_code.rb

@@ -0,0 +1,21 @@
+module Citrus
+  module Core
+    class ExitCode
+
+      attr_reader :value
+
+      def initialize(value)
+        @value = value.to_i
+      end
+
+      def success?
+        value == 0
+      end
+
+      def failure?
+        !success?
+      end
+
+    end
+  end
+end

data/lib/citrus/core/result.rb

@@ -0,0 +1,7 @@
+module Citrus
+  module Core
+    class Result
+
+    end
+  end
+end