vx-builder 0.0.27 → 0.0.28

data/spec/lib/builder/matrix_spec.rb

@@ -0,0 +1,226 @@
+require 'spec_helper'
+require 'yaml'
+
+describe Vx::Builder::Matrix 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",
+    "before_install" => "echo before_install",
+    "script"         => "echo script",
+  } }
+  let(:config) { Vx::Builder::BuildConfiguration.new attributes }
+  let(:matrix) { described_class.new config }
+
+  subject { matrix }
+
+  context "just created" do
+    its(:build_configuration) { should eq config }
+  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 'build_configurations' do
+
+    subject { matrix.build_configurations }
+
+    it { should have(12).items }
+
+    it "should copy script from source" do
+      expect(subject.map(&:script).flatten).to eq ["echo script"] * 12
+    end
+
+    it "should copy before_script from source" do
+      expect(subject.map(&:before_script).flatten).to eq ["echo before_script"] * 12
+    end
+
+    it "should copy before_install from source" do
+      expect(subject.map(&:before_install).flatten).to eq ["echo before_install"] * 12
+    end
+
+    context "without any matrix keys" do
+      let(:attributes) { {
+        "script" => %w{ /bin/true },
+      } }
+
+      it { should have(1).item }
+
+      context "attributes" do
+        subject { matrix.build_configurations.first.to_hash.select{|k,v| !v.empty? } }
+
+        it { should eq(
+          "env" => {
+            "matrix" => [],
+            "global" => []
+          },
+          "cache" => {
+            "directories" => [],
+            "enabled"     => true
+          },
+          "script" => ["/bin/true"]
+        ) }
+      end
+    end
+
+    context "with one :env and one :rvm key" do
+      let(:config) { Vx::Builder::BuildConfiguration.from_file fixture_path("travis_bug_1.yml") }
+
+      it "should have one :env and one :rvm key in matrix" do
+        keys = subject.map{|c| c.to_hash.select{|k,v| !v.empty? } }
+        expect(keys).to have(1).item
+
+        expect(keys.first["rvm"]).to eq ['2.0.0']
+        expect(keys.first['env']).to eq(
+          "matrix" => ["DB=postgresql"],
+          "global" => ["DB=postgresql"]
+        )
+      end
+    end
+
+    context "with :services key" do
+      let(:config) { Vx::Builder::BuildConfiguration.from_file fixture_path("travis_bug_2.yml") }
+
+      it "should have services in matrix" do
+        expect(subject).to have(1).item
+        expect(subject.first.services).to eq ['elasticsearch']
+      end
+    end
+
+    context "attributes" do
+      subject { matrix.build_configurations.map(&:matrix_id) }
+
+      it "should have true values" do
+        expect(subject).to 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 "with one matrix key" do
+        let(:attributes) { {
+          "rvm" => %w{ 2.0.0 },
+        } }
+
+        it { should eq ['rvm:2.0.0'] }
+      end
+    end
+  end
+
+  context "attributes_for_new_confgurations_with_merged_env" do
+    subject { matrix.attributes_for_new_build_configurations_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_build_configurations' do
+    subject { matrix.attributes_for_new_build_configurations }
+
+    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_keys_from_builds_configuration' do
+    subject { matrix.extract_keys_from_builds_configuration }
+    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_pairs" do
+    subject { format_values matrix.permutate_and_build_pairs }
+    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"  => [],
+      } }
+      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/support/create.rb

@@ -18,7 +18,7 @@ def create(name, options = {})
 
   when :source
     name = options[:name] || "travis.yml"
-    Vx::Builder::Source.from_yaml(fixture(name))
+    Vx::Builder::BuildConfiguration.from_yaml(fixture(name))
 
   when :env
     OpenStruct.new(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -123,9 +123,13 @@ files:
 - README.md
 - Rakefile
 - lib/vx/builder.rb
+- lib/vx/builder/build_configuration.rb
+- lib/vx/builder/build_configuration/cache.rb
+- lib/vx/builder/build_configuration/env.rb
 - lib/vx/builder/configuration.rb
 - lib/vx/builder/helper/config.rb
 - lib/vx/builder/helper/trace_sh_command.rb
+- lib/vx/builder/matrix.rb
 - lib/vx/builder/script.rb
 - lib/vx/builder/script/cache.rb
 - lib/vx/builder/script/clojure.rb
@@ -136,10 +140,6 @@ files:
 - lib/vx/builder/script/scala.rb
 - lib/vx/builder/script/script.rb
 - lib/vx/builder/script/services.rb
-- lib/vx/builder/source.rb
-- lib/vx/builder/source/constants.rb
-- lib/vx/builder/source/matrix.rb
-- lib/vx/builder/source/serializable.rb
 - lib/vx/builder/task.rb
 - lib/vx/builder/version.rb
 - spec/fixtures/clojure.yml
@@ -147,7 +147,9 @@ files:
 - spec/fixtures/travis.yml
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
+- spec/lib/builder/build_configuration_spec.rb
 - spec/lib/builder/configuration_spec.rb
+- spec/lib/builder/matrix_spec.rb
 - spec/lib/builder/script/cache_spec.rb
 - spec/lib/builder/script/clojure_spec.rb
 - spec/lib/builder/script/env_spec.rb
@@ -156,8 +158,6 @@ files:
 - spec/lib/builder/script/ruby_spec.rb
 - spec/lib/builder/script/scala_spec.rb
 - spec/lib/builder/script_spec.rb
-- spec/lib/builder/source_matrix_spec.rb
-- spec/lib/builder/source_spec.rb
 - spec/lib/builder/task_spec.rb
 - spec/lib/builder_spec.rb
 - spec/spec_helper.rb
@@ -194,7 +194,9 @@ test_files:
 - spec/fixtures/travis.yml
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
+- spec/lib/builder/build_configuration_spec.rb
 - spec/lib/builder/configuration_spec.rb
+- spec/lib/builder/matrix_spec.rb
 - spec/lib/builder/script/cache_spec.rb
 - spec/lib/builder/script/clojure_spec.rb
 - spec/lib/builder/script/env_spec.rb
@@ -203,8 +205,6 @@ test_files:
 - spec/lib/builder/script/ruby_spec.rb
 - spec/lib/builder/script/scala_spec.rb
 - spec/lib/builder/script_spec.rb
-- spec/lib/builder/source_matrix_spec.rb
-- spec/lib/builder/source_spec.rb
 - spec/lib/builder/task_spec.rb
 - spec/lib/builder_spec.rb
 - spec/spec_helper.rb

data/lib/vx/builder/source/constants.rb

@@ -1,12 +0,0 @@
-module Vx
-  module Builder
-    class Source
-
-      LANGS    = %w{ rvm scala jdk }.freeze
-      KEYS     = %w{ gemfile services before_script script before_install image
-                     after_success }.freeze
-      AS_ARRAY = (KEYS + LANGS).freeze
-
-    end
-  end
-end

data/lib/vx/builder/source/matrix.rb

@@ -1,116 +0,0 @@
-module Vx
-  module Builder
-    class Source
-      class Matrix
-
-        KEYS = (Source::LANGS + %w{ gemfile matrix_env:env image }).freeze
-        NOT_MATRIX_KEYS = %w{
-          script before_script services before_install
-          after_success
-        }
-
-        attr_reader :source
-
-        def initialize(build_configuration)
-          @source = build_configuration
-        end
-
-        def keys
-          extract_pair_of_key_and_values.map(&:first).sort
-        end
-
-        def configurations
-          attributes_for_new_configurations_with_merged_env.map do |attrs|
-            attrs = attrs.merge(
-              NOT_MATRIX_KEYS.inject({}) do |a,v|
-                a[v] = source.public_send(v)
-                a
-              end
-            )
-            Source.new attrs
-          end
-        end
-
-        def attributes_for_new_configurations_with_merged_env
-          attrs = attributes_for_new_configurations
-          attrs = [{}] if attrs.empty?
-          attrs.map do |a|
-            e = a["env"]
-            a["env"] = {
-              "global" => Array(e) + source.global_env,
-              "matrix" => e
-            }
-            a
-          end
-          attrs
-        end
-
-        def attributes_for_new_configurations
-          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.flatten]
-          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 = source[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/vx/builder/source/serializable.rb

@@ -1,43 +0,0 @@
-require 'yaml'
-require 'json'
-
-module Vx
-  module Builder
-    class Source
-
-      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)
-            Source.new attrs
-          end
-
-        end
-
-      end
-    end
-  end
-end

data/lib/vx/builder/source.rb

@@ -1,118 +0,0 @@
-require File.expand_path("../source/constants",    __FILE__)
-require File.expand_path("../source/matrix",       __FILE__)
-require File.expand_path("../source/serializable", __FILE__)
-
-module Vx
-  module Builder
-    class Source
-
-      include Source::Serializable
-
-      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 ||=
-          Matrix::KEYS.inject({}) do |a,k|
-          k_method, k_name = k.split(":")
-          k_name ||= k_method
-          val = send(k_method)
-          unless val.empty?
-            a[k_name] = val.first
-          end
-          a
-        end
-      end
-
-      def to_matrix_s
-        @to_matrix_s ||= matrix_keys.map{|k,v| "#{k}:#{v}" }.sort.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
-
-      def cached_directories
-        if attributes["cache"] == false
-          false
-        else
-          (attributes["cache"] && attributes["cache"]["directories"]) || []
-        end
-      end
-
-      def language
-        attributes["language"]
-      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