evrone-ci-router 0.2.0.pre22 → 0.2.0.pre23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92de4a001b5fa79a3bd8bea2e27af8facb905a23
-  data.tar.gz: 29a989af62aa16b1a31f36e2908e1a278bf6dd41
+  metadata.gz: 857440d03ba3e8bf50be6caf1aa03368060c200a
+  data.tar.gz: ce9fd7abad14ebbdbb62c6249e6c1a5e034edcee
 SHA512:
-  metadata.gz: c548a77d85f394c080f6a6450cc43d3333eb143e5bf7c99afd30d385c7cd120b57fb940f9d8516636e367ceb6c8b5074b03fd7a75922c963efc54d20a4e8da3e
-  data.tar.gz: 120ec793d0a8c0831c768fabf4e8881c797e9973211d526a6c69c8c418f82dcb19ca30a6ebcabe112541a9145c123a7e86cae1904dc5bde56ef2988f12528286
+  metadata.gz: f0e47b15e14ad3e615868ceb7e8b8ac90ca3696b42ff29e21a8ff7ab52ec455961f2182ad4cbef320e5653fea86979d0f36bd0a6ad221b3df28457958cf6cf13
+  data.tar.gz: 788a8ebb7646b4c4b00d62dc8502f7a01353c5f5b24a772685177c5e84144fce21069b6921ea70a8383ad4934a06e7b36495eebc35a8a81acab2f5abf33b2ae0

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 
 gem 'evrone-ci-common', path: File.expand_path("../../common", __FILE__)
 gem 'evrone-ci-message', path: File.expand_path("../../message", __FILE__)
+gem 'evrone-ci-build_configuration', path: File.expand_path("../../build_configuration", __FILE__)
 

data/evrone-ci-router.gemspec

@@ -18,8 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'evrone-ci-common',   "= #{Evrone::CI::Router::VERSION}"
-  spec.add_runtime_dependency 'evrone-ci-message',  "= #{Evrone::CI::Router::VERSION}"
+  spec.add_runtime_dependency 'evrone-ci-common',               "= #{Evrone::CI::Router::VERSION}"
+  spec.add_runtime_dependency 'evrone-ci-message',              "= #{Evrone::CI::Router::VERSION}"
+  spec.add_runtime_dependency 'evrone-ci-build_configuration',  "= #{Evrone::CI::Router::VERSION}"
+
   spec.add_runtime_dependency 'evrone-common-amqp', '~> 0.2.5'
   spec.add_runtime_dependency 'hashr',              '= 0.0.22'
 

data/lib/evrone/ci/router.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'thread'
 
 require 'evrone/ci/common/error_notifier'
+require 'evrone/ci/build_configuration'
 
 require File.expand_path("../..", __FILE__) + "/ci/router/ext/string.rb"
 require File.expand_path("../..", __FILE__) + "/ci/router/ext/array.rb"
@@ -14,9 +15,7 @@ module Evrone
 
       autoload :Configuration,        File.expand_path("../router/configuration",                    __FILE__)
       autoload :Build,                File.expand_path("../router/build",                            __FILE__)
-      autoload :BuildMatrix,          File.expand_path("../router/build_matrix",                     __FILE__)
       autoload :ScriptBuilder,        File.expand_path("../router/script_builder",                   __FILE__)
-      autoload :Travis,               File.expand_path("../router/travis",                           __FILE__)
       autoload :CLI,                  File.expand_path("../router/cli",                              __FILE__)
 
       autoload :BuildLogsConsumer,    File.expand_path("../router/consumers/build_logs_consumer",    __FILE__)
@@ -70,17 +69,17 @@ module Evrone
       include Helper::Logger
       include Helper::Config
 
-      attr_reader :build, :travis
+      attr_reader :build, :configuration
 
       def initialize(build)
-        @build        = build
-        @travis       = nil
+        @build         = build
+        @configuration = nil
       end
 
       def perform
         log_build do
           update_build_status do
-            load_travis &&
+            load_configuration &&
             create_and_delivery_build_matrix
           end
         end
@@ -88,24 +87,24 @@ module Evrone
       end
 
       def create_and_delivery_build_matrix
-        matrix = BuildMatrix.new travis
-        build.jobs_count = matrix.travises.size
+        matrix = BuildConfiguration::Matrix.new configuration
+        build.jobs_count = matrix.configurations.size
 
-        matrix.travises.each_with_index do |travis, idx|
+        matrix.configurations.each_with_index do |c, idx|
           number = idx + 1
-          message = build.to_perform_job_message travis, number
-          logger.info "delivery job #{message.id}.#{number} #{travis.to_matrix_s}"
+          message = build.to_perform_job_message c, number
+          logger.info "delivery job #{message.id}.#{number} #{c.to_matrix_s}"
           JobsConsumer.publish message
 
-          publish_job_status_message build, travis, number
+          publish_job_status_message build, c, number
         end
 
         true
       end
 
-      def load_travis
-        @travis = Travis.from_yaml build.message.travis
-        @travis
+      def load_configuration
+        @configuration = BuildConfiguration.from_yaml build.message.travis
+        @configuration
       end
 
       def log_build

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

@@ -27,8 +27,8 @@ module Evrone
           output.close
         end
 
-        def to_perform_job_message(travis, job_id)
-          script_builder   = travis.to_script_builder(self)
+        def to_perform_job_message(configuration, job_id)
+          script_builder   = ScriptBuilder.new self, configuration
           job_message = Message::PerformJob.new(
             id:               message.id,
             name:             message.name,
@@ -36,7 +36,7 @@ module Evrone
             before_script:    script_builder.to_before_script,
             script:           script_builder.to_script,
             after_script:     script_builder.to_after_script,
-            matrix_keys:      travis.matrix_keys,
+            matrix_keys:      configuration.matrix_keys,
           )
           job_message
         end

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

@@ -24,11 +24,11 @@ module Evrone
           use ScriptBuilder::Script
         end
 
-        attr_reader :travis, :build
+        attr_reader :configuration, :build
 
-        def initialize(build, travis)
-          @travis = travis
-          @build  = build
+        def initialize(build, configuration)
+          @configuration = configuration
+          @build         = build
         end
 
         def to_before_script
@@ -88,7 +88,7 @@ module Evrone
               script:          [],
               after_script:    [],
 
-              travis:          travis,
+              configuration:   configuration,
               build:           build,
             )
           end

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

@@ -9,7 +9,7 @@ module Evrone
 
           def call(env)
             env.init << 'export LC_ALL=en_US.UTF8'
-            env.travis.global_env.each do |e|
+            env.configuration.global_env.each do |e|
               env.init << trace_sh_command("export #{e}")
             end
             env.announce << trace_sh_command("env")

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

@@ -38,7 +38,7 @@ module Evrone
           private
 
             def rvm(env)
-              env.travis.rvm.first
+              env.configuration.rvm.first
             end
 
             def make_rbenv_version_command(env)

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

@@ -8,10 +8,10 @@ module Evrone
           include Helper::TraceShCommand
 
           def call(env)
-            env.travis.before_script.each do |c|
+            env.configuration.before_script.each do |c|
               env.before_script << trace_sh_command(c)
             end
-            env.travis.script.each do |c|
+            env.configuration.script.each do |c|
               env.script << trace_sh_command(c)
             end
             app.call(env)

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

@@ -8,7 +8,7 @@ module Evrone
           include Helper::Config
           include Helper::Logger
 
-          CASHER_URL = "https://raw.github.com/travis-ci/casher/master/bin/casher"
+          CASHER_URL = "https://raw.github.com/travis-ci/casher/production/bin/casher"
           CASHER_BIN = "$HOME/.casher/bin/casher"
 
           def call(env)
@@ -29,7 +29,7 @@ module Evrone
               name << env.build.message.name.dup
 
               # convert keys from ["rvm:2.0.0"] to "rvm 2.0.0"
-              name += env.travis.matrix_keys.map{|i| i.split(":").join(" ") }
+              name += env.configuration.matrix_keys.map{|i| i.split(":").join(" ") }
               # replace non word chars to ' '
               name = name.join("-").gsub(/[^a-z0-9_\-.]/, ' ')
 
@@ -52,11 +52,11 @@ module Evrone
 
             def fetch(env)
               env.init << "echo fetch cached content"
-              env.init << "#{CASHER_BIN} fetch #{env.webdav_cache_url} > /dev/null || true"
+              env.init << "#{CASHER_BIN} fetch #{env.webdav_cache_url} || true"
             end
 
             def add(env)
-              env.init << "#{CASHER_BIN} add $HOME/cached  > /dev/null || true"
+              env.init << "#{CASHER_BIN} add $HOME/cached || true"
               env.init << "unset CASHER_DIR"
             end
 

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

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

data/spec/lib/build_spec.rb

@@ -98,9 +98,9 @@ describe Evrone::CI::Router::Build do
   end
 
   context ".to_perform_job_message" do
-    let(:travis) { create :travis }
+    let(:config) { create :configuration }
     let(:job_id) { 2 }
-    subject { build.to_perform_job_message travis, job_id }
+    subject { build.to_perform_job_message config, job_id }
 
     it { should be_an_instance_of Evrone::CI::Message::PerformJob }
 

data/spec/lib/router_spec.rb

@@ -8,7 +8,7 @@ describe Evrone::CI::Router do
   subject { router }
 
   context "just created" do
-    its(:build)             { should eq build }
+    its(:build) { should eq build }
   end
 
   context "#perform" do
@@ -43,12 +43,12 @@ describe Evrone::CI::Router do
     end
   end
 
-  context "#load_travis" do
-    subject { router.load_travis }
+  context "#load_configuration" do
+    subject { router.load_configuration }
 
-    it "should build new travis instance from message" do
+    it "should build new BuildConfiguration instance from message" do
       expect(subject).to be_true
-      expect(router.travis).to be
+      expect(router.configuration).to be
     end
   end
 
@@ -57,10 +57,10 @@ describe Evrone::CI::Router do
     let(:message)  { messages.first }
     subject { router.create_and_delivery_build_matrix }
     before do
-      stub(router).travis { create :travis }
+      stub(router).configuration { create :configuration }
     end
 
-    it "should create build matrix from source travis and delivery its to jobs" do
+    it "should create build matrix from source configuration and delivery its to jobs" do
       expect(subject).to be_true
       expect(messages).to have(1).item
       expect(message.job_id).to eq 1

data/spec/lib/script_builder/webdav_cache_spec.rb

@@ -6,8 +6,8 @@ describe Evrone::CI::Router::ScriptBuilder::WebdavCache do
   let(:path)   { '/tmp/.test' }
   let(:app)    { ->(_) { _ } }
   let(:build)  { create :build }
-  let(:travis) { create :travis }
-  let(:env)    { OpenStruct.new build: build, init: [], travis: travis, after_script: [] }
+  let(:config) { create :configuration }
+  let(:env)    { OpenStruct.new build: build, init: [], configuration: config, after_script: [] }
   let(:mid)    { described_class.new app }
 
   subject { mid.call env }

data/spec/lib/script_builder_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Evrone::CI::Router::ScriptBuilder do
   let(:build)          { create :build }
-  let(:travis)         { create :travis }
-  let(:script_builder) { described_class.new build, travis }
+  let(:config)         { create :configuration }
+  let(:script_builder) { described_class.new build, config }
   subject { script_builder }
 
   context "just created" do
-    its(:travis) { should eq travis }
-    its(:build)  { should eq build  }
+    its(:configuration) { should eq config }
+    its(:build)         { should eq build  }
   end
 
   context "to_before_script" do

data/spec/support/create.rb

@@ -9,13 +9,13 @@ def create(who, *args)
   when :local_repo
     Evrone::CI::Router.root.join("fixtures/repo").to_s
 
-  when :travis
-    klass = Evrone::CI::Router::Travis
-    travis = nil
+  when :configuration
+    klass = Evrone::CI::BuildConfiguration
+    configuration = nil
     if options[:yaml]
-      travis = klass.from_yaml options[:yaml]
+      configuration = klass.from_yaml options[:yaml]
     elsif options[:attributes]
-      travis = klass.from_attributes options[:attributes]
+      configuration = klass.from_attributes options[:attributes]
     else
       klass.from_yaml fixture("travis.yml")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-router
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre22
+  version: 0.2.0.pre23
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evrone-ci-common
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre22
+        version: 0.2.0.pre23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre22
+        version: 0.2.0.pre23
 - !ruby/object:Gem::Dependency
   name: evrone-ci-message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre22
+        version: 0.2.0.pre23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre22
+        version: 0.2.0.pre23
+- !ruby/object:Gem::Dependency
+  name: evrone-ci-build_configuration
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0.pre23
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0.pre23
 - !ruby/object:Gem::Dependency
   name: evrone-common-amqp
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +155,6 @@ files:
 - fixtures/travis.yml
 - lib/evrone/ci/router.rb
 - lib/evrone/ci/router/build.rb
-- lib/evrone/ci/router/build_matrix.rb
 - lib/evrone/ci/router/cli.rb
 - lib/evrone/ci/router/configuration.rb
 - lib/evrone/ci/router/consumers/build_logs_consumer.rb
@@ -162,17 +175,13 @@ files:
 - lib/evrone/ci/router/script_builder/ruby.rb
 - lib/evrone/ci/router/script_builder/script.rb
 - lib/evrone/ci/router/script_builder/webdav_cache.rb
-- lib/evrone/ci/router/travis.rb
-- lib/evrone/ci/router/travis/serializable.rb
 - lib/evrone/ci/router/version.rb
-- spec/lib/build_matrix_spec.rb
 - spec/lib/build_spec.rb
 - spec/lib/configuration_spec.rb
 - spec/lib/router_spec.rb
 - spec/lib/script_builder/prepare_spec.rb
 - spec/lib/script_builder/webdav_cache_spec.rb
 - spec/lib/script_builder_spec.rb
-- spec/lib/travis_spec.rb
 - spec/spec_helper.rb
 - spec/support/create.rb
 - spec/support/fixture.rb
@@ -203,14 +212,12 @@ signing_key:
 specification_version: 4
 summary: ci router
 test_files:
-- spec/lib/build_matrix_spec.rb
 - spec/lib/build_spec.rb
 - spec/lib/configuration_spec.rb
 - spec/lib/router_spec.rb
 - spec/lib/script_builder/prepare_spec.rb
 - spec/lib/script_builder/webdav_cache_spec.rb
 - spec/lib/script_builder_spec.rb
-- spec/lib/travis_spec.rb
 - spec/spec_helper.rb
 - spec/support/create.rb
 - spec/support/fixture.rb

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

@@ -1,113 +0,0 @@
-module Evrone
-  module CI
-    class Router
-      class BuildMatrix
-
-        KEYS = (Travis::LANGS + %w{ matrix_env:env }).freeze
-        NOT_MATRIX_KEYS = %w{ script before_script }
-
-        attr_reader :travis
-
-        def initialize(travis)
-          @travis = travis
-        end
-
-        def keys
-          extract_pair_of_key_and_values.map(&:first).sort
-        end
-
-        def travises
-          attributes_for_new_travises_with_merged_env.map do |attrs|
-            attrs = attrs.merge(
-              NOT_MATRIX_KEYS.inject({}) do |a,v|
-                a[v] = travis.public_send(v)
-                a
-              end
-            )
-            Travis.new attrs
-          end
-        end
-
-        def attributes_for_new_travises_with_merged_env
-          attrs = attributes_for_new_travises
-          attrs = [{}] if attrs.empty?
-          attrs.map do |a|
-            e = a["env"]
-            a["env"] = {
-              "global" => Array(e) + travis.global_env,
-              "matrix" => e
-            }
-            a
-          end
-          attrs
-        end
-
-        def attributes_for_new_travises
-          permutate_and_build_values.inject([]) do |ac, values|
-            ac << values.inject({}) do |a,val|
-              a[val.key] = val.value
-              a
-            end
-            ac
-          end
-        end
-
-        def permutate_and_build_values
-          values = extract_pair_of_key_and_values.map do |key, vals|
-            vals.map{|it| Value.new(key, it) }
-          end
-          if matrix_values?(values)
-            array_permutations(values).map do |it|
-              if it.is_a?(Array)
-                it.flatten
-              else
-                [it]
-              end
-            end
-          else
-            values
-          end.sort_by(&:to_s)
-        end
-
-        def extract_pair_of_key_and_values
-          KEYS.map.inject([]) do |a, k|
-            k_method, k_name = k.split(":")
-            k_name ||= k_method
-
-            if (val = travis[k_method]) && !val.empty?
-              a << [k_name, val]
-            end
-            a
-          end
-        end
-
-        private
-
-          def matrix_values?(values)
-            !values.all?{|i| i.size == 1 }
-          end
-
-          def array_permutations array, index=0
-            # index is 0 by default : start at the beginning, more elegant.
-            return array[-1] if index == array.size - 1 # Return last element if at end.
-
-            result = []
-
-            array[index].each do |element| # For each array
-              array_permutations(array, index + 1).each do |x| # Permute permute permute
-                result << [element, x]
-              end
-            end
-            result
-          end
-
-          Value = Struct.new(:key, :value) do
-            def to_s
-              [key, value].join(":")
-            end
-          end
-
-      end
-    end
-  end
-end

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

@@ -1,110 +0,0 @@
-require File.expand_path("../travis/serializable", __FILE__)
-
-module Evrone
-  module CI
-    class Router
-      class Travis
-
-        include Travis::Serializable
-
-        LANGS    = %w{ rvm scala java go }.freeze
-        KEYS     = %w{ before_script script }.freeze
-        AS_ARRAY = (KEYS + LANGS).freeze
-
-        attr_reader :attributes
-        alias_method :to_hash, :attributes
-
-        def initialize(attrs = {})
-          @attributes = normalize_attributes attrs
-        end
-
-        def [](val)
-          public_send(val)
-        end
-
-        def matrix_keys
-          @matrix_keys ||=
-            BuildMatrix::KEYS.inject([]) do |a,k|
-              k_method, k_name = k.split(":")
-              k_name ||= k_method
-              val = send(k_method)
-              unless val.empty?
-                a << val.map{|v| "#{k_name}:#{v}" }
-              end
-              a
-            end.flatten.sort
-        end
-
-        def to_matrix_s
-          @to_matrix_s ||= matrix_keys.join(", ")
-        end
-
-        def to_script_builder(build)
-          ScriptBuilder.new(build, self)
-        end
-
-        def env
-          attributes["env"]
-        end
-
-        def matrix_env
-          attributes["env"]["matrix"]
-        end
-
-        def global_env
-          attributes["env"]["global"]
-        end
-
-        AS_ARRAY.each do |m|
-          define_method m do
-            @attributes[m] || []
-          end
-        end
-
-        def merge(attrs = {})
-          self.class.from_attributes self.attributes.merge(attrs)
-        end
-
-        private
-
-          def normalize_attributes(attributes)
-            attributes = attributes.inject({}) do |a,row|
-              k,v = row
-              if AS_ARRAY.include?(k.to_s)
-                v = Array(v)
-              end
-              a[k.to_s] = v
-              a
-            end
-            normalize_env_attribute attributes
-          end
-
-          def normalize_env_attribute(attributes)
-            env = (attributes['env'] || {}) .dup
-            case env
-            when Hash
-              attributes["env"] = {
-                "matrix" => Array(env['matrix']),
-                "global" => Array(env['global'])
-              }
-            else
-              attributes['env'] = {
-                "matrix" => Array(env).map(&:to_s),
-                "global" => []
-              }
-            end
-            freeze_normalized_attributes attributes
-          end
-
-          def freeze_normalized_attributes(attributes)
-            attributes.freeze
-            attributes['env'].freeze
-            attributes['env']['global'].freeze
-            attributes['env']['matrix'].freeze
-            attributes
-          end
-
-      end
-    end
-  end
-end

data/lib/evrone/ci/router/travis/serializable.rb

@@ -1,45 +0,0 @@
-require 'yaml'
-require 'json'
-
-module Evrone
-  module CI
-    class Router
-      class Travis
-
-        module Serializable
-
-          def self.included(base)
-            base.extend ClassMethods
-          end
-
-          def to_yaml
-            YAML.dump(attributes)
-          end
-
-          def to_hash
-            attributes
-          end
-
-          module ClassMethods
-
-            def from_file(file)
-              if File.readable? file
-                from_yaml File.read(file)
-              end
-            end
-
-            def from_yaml(yaml)
-              from_attributes YAML.load(yaml)
-            end
-
-            def from_attributes(attrs)
-              Travis.new attrs
-            end
-
-          end
-
-        end
-      end
-    end
-  end
-end

data/spec/lib/build_matrix_spec.rb

@@ -1,189 +0,0 @@
-require 'spec_helper'
-require 'yaml'
-
-describe Evrone::CI::Router::BuildMatrix do
-  let(:attributes) { {
-    env:   %w{ FOO=1 BAR=2 },
-    rvm:   %w{ 1.8.7 1.9.3 2.0.0 },
-    scala: %w{ 2.9.2 2.10.1 },
-    before_script: "echo before_script",
-    script: "echo script"
-  } }
-  let(:travis)  { create :travis, attributes: attributes }
-  let(:matrix)  { described_class.new travis }
-
-  subject { matrix }
-
-  context "just created" do
-    its(:travis) { should eq travis }
-  end
-
-  context "keys" do
-    subject { matrix.keys }
-    it { should eq %w{ env rvm scala } }
-    context "without matrix" do
-      let(:attributes) { {} }
-
-      it { should eq [] }
-    end
-  end
-
-  context 'travises' do
-    subject { matrix.travises }
-
-    it "should copy script from source" do
-      expect(subject.map(&:script).uniq).to eq [["echo script"]]
-    end
-
-    it "should copy before_script from source" do
-      expect(subject.map(&:before_script).uniq).to eq [["echo before_script"]]
-    end
-
-    context "without any matrix keys" do
-      let(:attributes) { {
-        script: %w{ /bin/true },
-      } }
-
-      it { should have(1).item }
-      its("first.attributes") { should eq(
-        "env"=>{"matrix"=>[], "global"=>[]},
-        "script"=>["/bin/true"],
-        "before_script"=>[]
-      )}
-    end
-
-    context "values" do
-
-      it { should have(12).items }
-
-      context "attributes" do
-        subject { matrix.travises.map(&:to_matrix_s) }
-
-        it do
-          should eq [
-            "env:BAR=2, rvm:1.8.7, scala:2.10.1",
-            "env:FOO=1, rvm:1.8.7, scala:2.10.1",
-            "env:BAR=2, rvm:1.8.7, scala:2.9.2",
-            "env:FOO=1, rvm:1.8.7, scala:2.9.2",
-            "env:BAR=2, rvm:1.9.3, scala:2.10.1",
-            "env:FOO=1, rvm:1.9.3, scala:2.10.1",
-            "env:BAR=2, rvm:1.9.3, scala:2.9.2",
-            "env:FOO=1, rvm:1.9.3, scala:2.9.2",
-            "env:BAR=2, rvm:2.0.0, scala:2.10.1",
-            "env:FOO=1, rvm:2.0.0, scala:2.10.1",
-            "env:BAR=2, rvm:2.0.0, scala:2.9.2",
-            "env:FOO=1, rvm:2.0.0, scala:2.9.2"
-          ]
-        end
-
-        context "without matrix" do
-          let(:attributes) { {
-            rvm: %w{ 2.0.0 },
-          } }
-
-          it { should eq ['rvm:2.0.0'] }
-        end
-
-      end
-    end
-  end
-
-  context "attributes_for_new_travises_with_merged_env" do
-    subject { matrix.attributes_for_new_travises_with_merged_env }
-
-    before do
-      attributes.merge!(
-        env: {
-          "global" => "FOO=1",
-          "matrix" => %w{ BAR=1 BAR=2 }
-        }
-      )
-    end
-
-    it { should have(12).items }
-
-    it "should merge matrix env to global env" do
-      expect(subject.map{|i| i["env"]["global"] }.uniq.sort).to eq([["BAR=1", "FOO=1"], ["BAR=2", "FOO=1"]])
-    end
-  end
-
-  context 'attributes_for_new_travises' do
-    subject { matrix.attributes_for_new_travises }
-
-    it { should have(12).items }
-
-    its(:first) { should eq("rvm"   => "1.8.7",
-                            "scala" => "2.10.1",
-                            "env"   => "BAR=2") }
-    its(:last)  { should eq("rvm"   => "2.0.0",
-                            "scala" => "2.9.2",
-                            "env"   => "FOO=1") }
-  end
-
-  context 'extract_pair_of_key_and_values' do
-    subject { matrix.extract_pair_of_key_and_values }
-    it {
-      should eq [
-        ["rvm",   %w{ 1.8.7 1.9.3 2.0.0 }],
-        ["scala", %w{ 2.9.2 2.10.1 }],
-        ["env",   %w{ FOO=1 BAR=2 }]
-      ]
-    }
-  end
-
-  context "permutate_and_build_values" do
-    subject { format_values matrix.permutate_and_build_values }
-    let(:expected) { [
-      %w{env:BAR=2 rvm:1.8.7 scala:2.10.1},
-      %w{env:BAR=2 rvm:1.8.7 scala:2.9.2},
-      %w{env:BAR=2 rvm:1.9.3 scala:2.10.1},
-      %w{env:BAR=2 rvm:1.9.3 scala:2.9.2},
-      %w{env:BAR=2 rvm:2.0.0 scala:2.10.1},
-      %w{env:BAR=2 rvm:2.0.0 scala:2.9.2},
-      %w{env:FOO=1 rvm:1.8.7 scala:2.10.1},
-      %w{env:FOO=1 rvm:1.8.7 scala:2.9.2},
-      %w{env:FOO=1 rvm:1.9.3 scala:2.10.1},
-      %w{env:FOO=1 rvm:1.9.3 scala:2.9.2},
-      %w{env:FOO=1 rvm:2.0.0 scala:2.10.1},
-      %w{env:FOO=1 rvm:2.0.0 scala:2.9.2},
-    ] }
-
-    it { should eq expected }
-
-    context "with empty keys" do
-      let(:attributes) { {
-        env:   %w{ FOO=1 BAR=2 },
-        rvm:   %w{ 1.8.7 1.9.3 2.0.0 },
-        scala: %w{ 2.9.2 2.10.1 },
-        java: [],
-        go: nil
-      } }
-      it { should eq expected }
-    end
-
-    context "with one key" do
-      let(:attributes) { {
-        rvm:   %w{ 1.9.3 2.0.0 },
-      } }
-      let(:expected) {[
-        %w{ rvm:1.9.3 },
-        %w{ rvm:2.0.0 }
-      ]}
-      it { should eq expected }
-    end
-
-    context "without matrix" do
-      let(:attributes) { {
-        rvm:   %w{ 2.0.0 },
-      } }
-      let(:expected) {[
-        %w{ rvm:2.0.0 }
-      ]}
-      it { should eq expected }
-    end
-
-    def format_values(values)
-      values.map{|i| i.map(&:to_s).sort }.sort
-    end
-  end
-end

data/spec/lib/travis_spec.rb

@@ -1,183 +0,0 @@
-require 'spec_helper'
-
-describe Evrone::CI::Router::Travis do
-  let(:content) { YAML.load fixture('travis.yml') }
-  let(:travis) { described_class.from_attributes content }
-  subject { travis }
-
-  its(:attributes)    { should be }
-  its(:rvm)           { should eq %w{ 2.0.0 } }
-  its(:before_script) { should eq ["echo before_script"] }
-  its(:script)        { should eq ["RAILS_ENV=test ls -1 && echo DONE!"] }
-
-  context "merge" do
-    let(:new_attrs) { { rvm: "replaced" } }
-    subject{ travis.merge new_attrs }
-
-    it "should build a new travis instance" do
-      expect(subject).to be_an_instance_of(described_class)
-    end
-
-    it "should replace attributes" do
-      expect(subject.attributes["rvm"]).to eq %w{ replaced }
-    end
-  end
-
-  context "(serialization)" do
-
-    context "build new instance" do
-      let(:expected) { {
-        "rvm"           => ["2.0.0"],
-        "before_script" => ["echo before_script"],
-        "script"        => ["RAILS_ENV=test ls -1 && echo DONE!"],
-        "env" => {
-          "matrix" => [],
-          "global" => []
-        }
-      } }
-
-      context "from_yaml" do
-        subject { described_class.from_yaml(fixture('travis.yml')).attributes }
-        it { should eq expected }
-      end
-
-      context "form_file" do
-        subject { described_class.from_file('fixtures/travis.yml').attributes }
-        it { should eq expected }
-      end
-
-      context "from_attributes" do
-        let(:attrs) {{
-          rvm:           "2.0.0",
-          before_script: "echo before_script",
-          script:        "RAILS_ENV=test ls -1 && echo DONE!"
-        }}
-        subject { described_class.from_attributes(attrs).attributes }
-        it { should eq expected }
-      end
-    end
-
-    context ".to_yaml" do
-      subject { travis.to_yaml }
-      it { should eq travis.attributes.to_yaml }
-    end
-  end
-
-  context "to_script_builder" do
-    let(:build) { create :build }
-    subject { travis.to_script_builder build }
-    it { should be }
-  end
-
-  context "to_matrix_s" do
-    subject { travis.to_matrix_s }
-    it { should eq 'rvm:2.0.0' }
-
-    context "when many items" do
-      before do
-        mock(travis).rvm { %w{ 1.9.3 2.0.0 } }
-        mock(travis).scala { %w{ 2.10.1 } }
-      end
-      it { should eq "rvm:1.9.3, rvm:2.0.0, scala:2.10.1" }
-    end
-  end
-
-  context "matrix_keys" do
-    subject { travis.matrix_keys }
-    it { should eq %w{ rvm:2.0.0 } }
-
-    context "when many items" do
-      before do
-        mock(travis).rvm { %w{ 1.9.3 2.0.0 } }
-        mock(travis).scala { %w{ 2.10.1 } }
-      end
-      it { should eq %w{ rvm:1.9.3 rvm:2.0.0 scala:2.10.1 }}
-    end
-  end
-
-
-  it "empty attributes must be empty Array" do
-    expect(travis.scala).to eq([])
-  end
-
-  context "normalize_attributes" do
-    described_class::AS_ARRAY.each do |m|
-      context "convert #{m} attribute to Array" do
-        let(:content) { { m => m } }
-        subject { travis.__send__(m) }
-        it { should eq([m]) }
-      end
-    end
-
-    context "convert hash keys to strings" do
-      let(:content) { { rvm: "rvm" } }
-      subject { travis.attributes }
-      it { should include("rvm" => %w{rvm}) }
-    end
-
-    context "build env hash" do
-      subject { travis.attributes["env"] }
-
-      context "from String" do
-        let(:content) { { env: "FOO" } }
-        it { should eq( "global" => [], "matrix" => %w{ FOO } ) }
-      end
-
-      context "from Array" do
-        let(:content) { { env: %w{ FOO BAR } } }
-        it { should eq( 'global' => [], 'matrix' => %w{ FOO BAR } ) }
-      end
-
-      context "from empty Hash" do
-        let(:content) { { env: {} } }
-        it { should eq( 'global' => [], 'matrix' => [] ) }
-      end
-
-      context "from Hash" do
-        let(:content) { { env: { "global" => "1", 'matrix' => '2' } } }
-        it { should eq( 'global' => %w{1}, 'matrix' => %w{2} ) }
-      end
-    end
-  end
-
-  context "env" do
-    let(:content) { { env: env } }
-    subject { travis.env }
-
-    context "when attributes[env] is Array" do
-      let(:env) { %w{ FOO=1 BAR=2 } }
-      it { should eq("matrix"=>["FOO=1", "BAR=2"], "global"=>[]) }
-    end
-
-    context "when attributes[env] is Hash" do
-      let(:env) { { "matrix" => %w{ BAZ=1 } } }
-      it { should eq("matrix"=>["BAZ=1"], "global"=>[]) }
-    end
-
-    context "when attributes[env] is empty" do
-      let(:env) { {} }
-      it { should eq("matrix"=>[], "global"=>[]) }
-    end
-  end
-
-  context "global_env" do
-    let(:content) { { env: env } }
-    subject { travis.global_env }
-
-    context "when attributes[env] is Array" do
-      let(:env) { %w{ FOO=1 } }
-      it { should eq([]) }
-    end
-
-    context "when attributes[env] is Hash" do
-      let(:env) { { "global" => %w{ FOO=1 } } }
-      it { should eq %w{ FOO=1 } }
-    end
-
-    context "when attributes[env] is empty" do
-      let(:env) { {} }
-      it { should eq([]) }
-    end
-  end
-
-end