evrone-ci-router 0.2.0.pre5 → 0.2.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eaca86f6f37eb7af8d1e7817f99b833f5693d5c
-  data.tar.gz: a161f3bb1eb84f7e35647b5508e008528ca489cc
+  metadata.gz: 5b94c8376879d91b2de864073f24bc5d589bccfd
+  data.tar.gz: 368d854de16ce106accf64c68fa0dc7e09095e39
 SHA512:
-  metadata.gz: 4512bb8e7d369c43a232945bcba2e1315f31aa53d5edda9acc27d87514e59d61710988e72243ce7f0114930a03f8e0527c84dc3d85b33334bd98fea39460822a
-  data.tar.gz: 206febdaae5c7ca4b9bf9300e0010c15edb6ce69f7d7a5ddf1ce67eae19d67d0e35ddc2962d0827c6500a3870cbc46248359245f7aebedfec75a560ac0799bbd
+  metadata.gz: ab083e25b26e0aedd1b4097ac21e670457ad7683eca48e70c61006f1c66da815e60b211bf5c96a6bed65c9ccda17ef54688d160a08d277464f364eda083fe41f
+  data.tar.gz: 54f17cc8e86715801242e2f0a3f20d80a8ff1b63efd85e7f99966666e63dc220844d7a49ff1b6bc3d164a6ff986d7f4445808210a6373e4848765d8249015e47

data/lib/evrone/ci/router.rb

@@ -134,16 +134,6 @@ module Evrone
 
       private
 
-        def scm
-          @scm ||= SCM::Git.new(
-            build.message.src,
-            build.message.sha,
-            repo_dir,
-            deploy_key: build.message.deploy_key,
-            &build.method(:add_to_output)
-          )
-        end
-
         def publish_build_status_message(status)
           message = build.to_build_status_message(status)
           logger.info "delivered build status #{message.inspect}"

data/lib/evrone/ci/router/cli.rb

@@ -16,8 +16,6 @@ module Evrone
         end
 
         def run
-          logger.warn "spawn inside #{config.path_prefix}"
-
           trap('INT') {
             Thread.new do
               Evrone::Common::AMQP.shutdown
@@ -37,9 +35,6 @@ module Evrone
               opts.on("-w", "--workers NUM", "Number of workers, default 1") do |v|
                 @options[:workers] = v.to_i
               end
-              opts.on("-p", "--path PATH", "Working directory, default current directory") do |v|
-                @options[:path_prefix] = v.to_s
-              end
               opts.on("-c", "--config FILE", "Path to configuration file") do |v|
                 read_configuration v
               end

data/lib/evrone/ci/router/configuration.rb

@@ -15,9 +15,7 @@ module Evrone
         define amqp_url:          nil,
                timeout:           30 * 60,
                logger:            Common::TaggedLogging.new(Logger.new STDOUT),
-               repo_dir_name:     "repo",
                workers:           1,
-               path_prefix:       nil,
                webdav_cache_url:  nil
 
 
@@ -25,10 +23,6 @@ module Evrone
           self[:timeout].to_i
         end
 
-        def path_prefix
-          self[:path_prefix] || Dir.pwd
-        end
-
       end
     end
   end

data/lib/evrone/ci/router/consumers/builds_consumer.rb

@@ -14,11 +14,10 @@ module Evrone
         model Message::PerformBuild
 
         def perform(message)
-          build       = Build.new message
-          number      = Thread.current[:consumer_id] || 0
-          path_prefix = "#{Router.config.path_prefix}/build.#{number}"
+          build = Build.new message
+          _     = Thread.current[:consumer_id] || 0
 
-          Router.new(build, path_prefix).perform
+          Router.new(build).perform
           ack!
         end
 

data/lib/evrone/ci/router/script_builder/env.rb

@@ -12,9 +12,6 @@ module Evrone
             env.travis.global_env.each do |e|
               env.init << trace_sh_command("export #{e}")
             end
-            env.travis.matrix_env.each do |e|
-              env.init << trace_sh_command("export #{e}")
-            end
             env.announce << trace_sh_command("env")
             app.call(env)
           end

data/lib/evrone/ci/router/script_builder/prepare.rb

@@ -44,7 +44,10 @@ module Evrone
           private
 
             def build_scm(env, sha, path)
-              SCM::Git.new(env.build.message.src, sha, "$PWD/#{path}")
+              SCM::Git.new(env.build.message.src,
+                           sha,
+                           "$PWD/#{path}",
+                           branch: env.build.message.branch)
             end
 
         end

data/lib/evrone/ci/router/version.rb

@@ -1,7 +1,7 @@
 module Evrone
   module CI
     class Router
-      VERSION = "0.2.0.pre5"
+      VERSION = "0.2.0.pre6"
     end
   end
 end

data/spec/lib/configuration_spec.rb

@@ -19,6 +19,5 @@ describe Evrone::CI::Router::Configuration do
     its(:timeout)       { should eq 1 }
     its(:amqp_url)      { should eq "2" }
     its(:workers)       { should eq 1 }
-    its(:repo_dir_name) { should eq 'repo' }
   end
 end

data/spec/lib/router_spec.rb

@@ -67,8 +67,4 @@ describe Evrone::CI::Router do
     end
   end
 
-  def mock_repo_dir
-    stub(router).repo_dir { Pathname.new fixture_path("repo") }
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-router
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre5
+  version: 0.2.0.pre6
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evrone-ci-common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre5
+        version: 0.2.0.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre5
+        version: 0.2.0.pre6
 - !ruby/object:Gem::Dependency
   name: evrone-ci-message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre5
+        version: 0.2.0.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre5
+        version: 0.2.0.pre6
 - !ruby/object:Gem::Dependency
   name: evrone-common-amqp
   requirement: !ruby/object:Gem::Requirement