vx-builder 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bf32f25cb592999f9dfca1d3bed3ee762f85ef2
-  data.tar.gz: 12652c16f67e5ff130b42e1df321228405bcbb8a
+  metadata.gz: 84b253cffa5e036ddd0fb814840cf117f33f282f
+  data.tar.gz: d2d046cb4c403a212810654fd4b9dfe7a35a07e1
 SHA512:
-  metadata.gz: 16ed79beb723c4c401c80d5089a6ed9128fa070eee24ce4cb857c50f6435d2ecc2a05387d182e33f1cde4287d25d0f9a6bd06cf5c68cedb103ae8725515edfbf
-  data.tar.gz: b9621c5bbb28305c0d76960dbc6546e81fa21e7b953265ac65df10a8861eeb22304144c92a3811297eecb1cd64a972add6534db40f8f6d750930d55b554816c2
+  metadata.gz: 05d0a7efa18bd2bd798703874cc8604e33e0debf81df8219bb082a576f01984ee747247c8200560994a05d5df0d3052a38d5dde190657c52696d031e71444edf
+  data.tar.gz: e95b0904223534d3ae08b96cf7c51429d1a337ce1a109bd0191598245dde5738744948aed6a96e4c6252967796ffa0301f828055f15648ee47292f7cda0188d3

data/lib/vx/builder/build_configuration/cache.rb

@@ -0,0 +1,48 @@
+module Vx
+  module Builder
+    class BuildConfiguration
+      class Cache
+
+        attr_reader :attributes
+
+        def initialize(new_cache)
+          normalize_attributes(new_cache)
+        end
+
+        def directories
+          @attributes["directories"]
+        end
+
+        def enabled?
+          @attributes["enabled"]
+        end
+
+        private
+
+          def normalize_attributes(new_cache)
+
+            @attributes =
+              case new_cache
+              when nil
+                {
+                  "directories" => [],
+                  "enabled"     => true,
+                }
+              when Hash
+                {
+                  "directories" => Array(new_cache["directories"]).flatten.map(&:to_s),
+                  "enabled"     => true,
+                }
+              else
+                {
+                  "directories" => [],
+                  "enabled"     => false
+                }
+              end
+
+          end
+
+      end
+    end
+  end
+end

data/lib/vx/builder/build_configuration/env.rb

@@ -0,0 +1,43 @@
+module Vx
+  module Builder
+    class BuildConfiguration
+      class Env
+
+        attr_reader :attributes
+
+        def initialize(new_env)
+          normalize_attributes(new_env)
+        end
+
+        def matrix
+          @attributes["matrix"]
+        end
+
+        def global
+          @attributes["global"]
+        end
+
+        private
+
+          def normalize_attributes(new_env)
+
+            @attributes =
+              case new_env
+              when Hash
+                {
+                  "matrix" => Array(new_env['matrix']),
+                  "global" => Array(new_env['global'])
+                }
+              else
+                {
+                  "matrix" => Array(new_env).flatten.map(&:to_s),
+                  "global" => []
+                }
+              end
+
+          end
+
+      end
+    end
+  end
+end

data/lib/vx/builder/build_configuration.rb

@@ -0,0 +1,113 @@
+require 'yaml'
+
+Dir[File.expand_path("../build_configuration/*.rb", __FILE__)].each do |f|
+  require f
+end
+
+module Vx
+  module Builder
+    class BuildConfiguration
+
+      ATTRIBUTES = %w{
+        rvm
+        scala
+        jdk
+        language
+
+        gemfile
+        services
+        image
+
+        before_install
+        before_script
+        script
+        after_success
+      }
+
+      class << self
+        def from_yaml(yaml)
+          hash = YAML.load(yaml)
+          new hash
+        end
+
+        def from_file(file)
+          if File.readable? file
+            from_yaml File.read(file)
+          end
+        end
+      end
+
+      attr_reader :env, :cache
+
+      def initialize(new_attributes = {}, matrix_attributes = {})
+        new_attributes = {} unless new_attributes.is_a?(Hash)
+
+        @env   = Env.new(new_attributes["env"])
+        @cache = Cache.new(new_attributes["cache"])
+        @matrix_attributes = matrix_attributes
+
+        build_attributes new_attributes
+      end
+
+      def matrix_attributes
+        @matrix_attributes.inject({}) do |a,pair|
+          k,v = pair
+          if k == 'env'
+            v = v["matrix"].first
+          end
+          if v
+            a[k] = v
+          end
+          a
+        end
+      end
+
+      # for tests
+      def matrix_id
+        matrix_attributes.to_a.map{|i| i.join(":") }.sort.join(", ")
+      end
+
+      def to_hash
+        attributes.merge("env"   => env.attributes)
+                  .merge("cache" => cache.attributes)
+      end
+
+      def to_yaml
+        to_hash.to_yaml
+      end
+
+      def env_matrix
+        env.matrix
+      end
+
+      def language
+        @attributes["language"].first
+      end
+
+      def cached_directories
+        @cache.enabled? and @cache.directories
+      end
+
+      (ATTRIBUTES - %w{ language }).each do |attr|
+        define_method attr do
+          attributes[attr]
+        end
+      end
+
+      private
+
+        def attributes
+          @attributes
+        end
+
+        def build_attributes(new_attributes)
+          @attributes = ATTRIBUTES.inject({}) do |ac, attribute_name|
+            attribute = new_attributes[attribute_name]
+            ac[attribute_name] = Array(attribute)
+            ac
+          end
+        end
+
+    end
+  end
+end

data/lib/vx/builder/matrix.rb

@@ -0,0 +1,112 @@
+module Vx
+  module Builder
+    Matrix = Struct.new(:build_configuration) do
+
+      KEYS = %w{
+        rvm
+        gemfile
+        scala
+        jdk
+
+        image
+        env_matrix:env
+      }
+
+      def keys
+        extract_keys_from_builds_configuration.map(&:first).sort
+      end
+
+      def build_configurations
+        new_attributes = build_configuration.to_hash.dup
+        attributes_for_new_build_configurations_with_merged_env.map do |matrix_attributes|
+          new_attributes.merge!(matrix_attributes)
+          BuildConfiguration.new new_attributes, matrix_attributes
+        end
+      end
+
+      def attributes_for_new_build_configurations_with_merged_env
+        attrs = attributes_for_new_build_configurations
+        attrs = [{}] if attrs.empty?
+        attrs.map! do |a|
+          env = a["env"]
+          a["env"] = {
+            "global" => Array(env) + build_configuration.env.global,
+            "matrix" => Array(env)
+          }
+          a
+        end
+
+        attrs
+      end
+
+      def attributes_for_new_build_configurations
+        permutate_and_build_pairs.inject([]) do |ac, pairs|
+          ac << pairs.inject({}) do |a,pair|
+            a[pair.key] = pair.value
+            a
+          end
+          ac
+        end
+      end
+
+      def permutate_and_build_pairs
+        pairs = extract_keys_from_builds_configuration.map do |key_name, values|
+          values.map{|v| Pair.new(key_name, v) }
+        end
+
+        if not_matrix?(pairs)
+          [pairs.flatten]
+        else
+          array_permutations(pairs).map do |it|
+            if it.is_a?(Array)
+              it.flatten
+            else
+              [it]
+            end
+          end
+        end.sort_by(&:to_s)
+      end
+
+      def extract_keys_from_builds_configuration
+        KEYS.inject([]) do |a, key|
+          key_method, key_name = key.split(":")
+          key_name ||= key_method
+
+          value = build_configuration.public_send(key_method)
+          unless value.empty?
+            a << [key_name, value]
+          end
+
+          a
+        end
+      end
+
+      private
+
+        def not_matrix?(pairs)
+          pairs.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
+
+        Pair = Struct.new(:key, :value) do
+          def to_s
+            [key, value].join(":")
+          end
+        end
+
+    end
+  end
+end

data/lib/vx/builder/script/env.rb

@@ -15,7 +15,7 @@ module Vx
             env.init << "export CI_BRANCH=#{b}"
           end
 
-          env.source.global_env.each do |e|
+          env.source.env.global.each do |e|
             env.init << trace_sh_command("export #{e}")
           end
           app.call(env)

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.0.27"
+    VERSION = "0.0.28"
   end
 end

data/lib/vx/builder.rb

@@ -2,10 +2,12 @@ require File.expand_path("../builder/version", __FILE__)
 
 module Vx
   module Builder
-    autoload :Source,        File.expand_path("../builder/source",        __FILE__)
-    autoload :Script,        File.expand_path("../builder/script",        __FILE__)
-    autoload :Task,          File.expand_path("../builder/task",          __FILE__)
-    autoload :Configuration, File.expand_path("../builder/configuration", __FILE__)
+    autoload :Source,             File.expand_path("../builder/source",              __FILE__)
+    autoload :Script,             File.expand_path("../builder/script",              __FILE__)
+    autoload :Task,               File.expand_path("../builder/task",                __FILE__)
+    autoload :Configuration,      File.expand_path("../builder/configuration",       __FILE__)
+    autoload :BuildConfiguration, File.expand_path("../builder/build_configuration", __FILE__)
+    autoload :Matrix,             File.expand_path("../builder/matrix",              __FILE__)
 
     module Helper
       autoload :Config, File.expand_path("../builder/helper/config", __FILE__)

data/spec/fixtures/travis.yml

@@ -1,22 +1,32 @@
-rvm:
-  - 2.0.0
-gemfile:
-  - 'Gemfile'
-before_script:
-  - "echo before_script"
-before_install:
-  - "echo before_install"
+rvm: 2.0.0
+
+gemfile: 'Gemfile'
+
+before_script: "echo before_script"
+
+before_install: "echo before_install"
+
 script: "RAILS_ENV=test ls -1 && echo DONE!"
 
-after_success:
-  - "echo after success"
+after_success: "echo after success"
 
-cache:
-  directories:
-  - ~/.cache
+services: "rabbitmq"
+
+scala: "2.10.3"
+
+jdk: "openjdk7"
 
 image:
   - one
   - two
 
 language: ruby
+
+env:
+  global: 'global'
+  matrix: 'matrix'
+
+cache:
+  directories:
+  - ~/.cache
+

data/spec/lib/builder/build_configuration_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe Vx::Builder::BuildConfiguration do
+  let(:default_content) { YAML.load fixture('travis.yml') }
+  let(:content)         { default_content }
+  let(:config)          { described_class.new content }
+  subject { config }
+
+  its(:to_hash)        { should_not be_empty }
+  its(:rvm)            { should eq %w{ 2.0.0 } }
+  its(:gemfile)        { should eq %w{ Gemfile } }
+  its(:before_script)  { should eq ["echo before_script"] }
+  its(:before_install) { should eq ["echo before_install"] }
+  its(:script)         { should eq ["RAILS_ENV=test ls -1 && echo DONE!"] }
+  its(:after_success)  { should eq ["echo after success"] }
+  its(:image)          { should eq %w{ one two } }
+  its(:language)       { should eq 'ruby' }
+  its(:services)       { should eq %w{ rabbitmq } }
+  its(:scala)          { should eq %w{ 2.10.3 } }
+  its(:jdk)            { should eq %w{ openjdk7 } }
+
+  context "to_hash" do
+    subject { config.to_hash }
+
+    it { should eq(
+      {
+       "after_success"  => ["echo after success"],
+       "before_install" => ["echo before_install"],
+       "before_script"  => ["echo before_script"],
+       "cache" => {
+         "directories"  => ["~/.cache"],
+         "enabled"      => true
+       },
+       "env" => {
+         "matrix"       => ["matrix"],
+         "global"       => ["global"]
+       },
+       "gemfile"        => ["Gemfile"],
+       "image"          => ["one", "two"],
+       "jdk"            => ['openjdk7'],
+       "language"       => ["ruby"],
+       "rvm"            => ["2.0.0"],
+       "scala"          => ['2.10.3'],
+       "script"         => ["RAILS_ENV=test ls -1 && echo DONE!"],
+       "services"       => ['rabbitmq']
+      }
+    ) }
+  end
+
+  context "env" do
+    subject { config.env }
+
+    context "when is array" do
+      let(:content) { { 'env' => %w{ 1 2 3 } } }
+      its(:matrix) { should eq %w{1 2 3} }
+      its(:global) { should eq [] }
+    end
+
+    context "when is hash" do
+      let(:content) { { 'env' => {
+        'global' => "global",
+        "matrix" => "matrix"
+      } } }
+      its(:matrix) { should eq %w{matrix} }
+      its(:global) { should eq %w{global} }
+    end
+
+    context "when is empty" do
+      let(:content) { {} }
+      its(:matrix) { should eq [] }
+      its(:global) { should eq [] }
+    end
+  end
+
+  context "cache" do
+    subject { config.cache }
+
+    context "when directories present" do
+      let(:content) { { "cache" => {
+        "directories" => ["~/.cache"]
+      } } }
+      its(:directories) { should eq ["~/.cache"] }
+      its(:enabled?)    { should be_true }
+    end
+
+    context "when directories is not exists" do
+      let(:content) { {} }
+      its(:directories) { should eq [] }
+      its(:enabled?)    { should be_true }
+    end
+
+    context "when disabled" do
+      let(:content) { { "cache" => false } }
+      its(:directories) { should eq [] }
+      its(:enabled?)    { should be_false }
+    end
+  end
+
+end