vx-builder 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ab9ab91d17a55a73837109ae9902333b4e30ed6
-  data.tar.gz: 22fffcd33f5f99ec84bbc212d543d77db9f33cd6
+  metadata.gz: 2337275d42297ff4b29ba6182f58b872f98eaa64
+  data.tar.gz: 6064c28dc12fbf2f69f2e609b650c64bbd8bdea8
 SHA512:
-  metadata.gz: 0bd428270626503ae8b283dfcb87711e712d6dc8ea2245f22332c410e6f3292222dcca7a8804dd2a3edf778c5e4b59211aa0d3ddeadd7d752306fb0c523d1bac
-  data.tar.gz: 7ec8fbc6099297b9c61f0b0ecd61a86a54af49ef856d88044437d66bf93fcfd59b9bfdc458cf5130ae6d2c23a84d0ebd1802deff589d7551334ad9bee640adc9
+  metadata.gz: 71dc59d14727f7b33483d8e480a6e81764ecc19fe95cd6b815af0be0b05857d47d5f254e2bd9811b4b106d48aca2549ef477722e30438ca641b75967ed12e400
+  data.tar.gz: a5a89fc805bb85257eaa20013e0462aeb3dbf7b67b4409fe56ae696df1437dac2a8c5fa6efc9e79d494b1175fab13418c22a658cd90d5fc70f22ccabfd317d32

data/lib/vx/builder.rb

@@ -9,7 +9,6 @@ module Vx
 
     module Helper
       autoload :Config, File.expand_path("../builder/helper/config", __FILE__)
-      autoload :Logger, File.expand_path("../builder/helper/logger", __FILE__)
       autoload :TraceShCommand, File.expand_path("../builder/helper/trace_sh_command", __FILE__)
     end
 
@@ -17,10 +16,6 @@ module Vx
 
     extend self
 
-    def logger
-      config.logger
-    end
-
     def configure
       yield config if block_given?
       config

data/lib/vx/builder/configuration.rb

@@ -1,6 +1,4 @@
 require 'hashr'
-require 'logger'
-require 'vx/common/tagged_logging'
 
 module Vx
   module Builder
@@ -8,11 +6,10 @@ module Vx
 
       extend Hashr::EnvDefaults
 
-      self.env_namespace = 'vx'
+      self.env_namespace      = 'vx'
       self.raise_missing_keys = true
 
-      define logger:      Common::TaggedLogging.new(Logger.new STDOUT),
-             casher_ruby: "/usr/local/rbenv/versions/1.9.3-p484/bin/ruby"
+      define casher_ruby: "/usr/local/rbenv/versions/1.9.3-p484/bin/ruby"
 
     end
   end

data/lib/vx/builder/script.rb

@@ -72,24 +72,25 @@ module Vx
         def default_env
           OpenStruct.new(
             # initialization, repo does not exists
-            init:            [],
+            init:               [],
 
             # before instalation, using for system setup
-            before_install:  [],
+            before_install:     [],
 
             # instalation, using for application setup
-            install:         [],
+            install:            [],
 
             # announce software and services version
-            announce:        [],
+            announce:           [],
 
-            before_script:   [],
-            script:          [],
-            after_script:    [],
+            before_script:      [],
+            script:             [],
+            after_script:       [],
 
-            source:          source,
-            task:            task,
-            cache_key:       []
+            source:             source,
+            task:               task,
+            cache_key:          [],
+            cached_directories: []
           )
         end
 

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

@@ -5,7 +5,6 @@ module Vx
       Cache = Struct.new(:app) do
 
         include Helper::Config
-        include Helper::Logger
 
         CASHER_URL = "https://raw2.github.com/dima-exe/casher/master/bin/casher"
         CASHER_BIN = "$HOME/.casher/bin/casher"
@@ -13,7 +12,7 @@ module Vx
         def call(env)
           rs = app.call env
 
-          if env.task.cache_url_prefix
+          if env.task.cache_url_prefix && enabled?(env)
             assign_url_to_env(env)
             prepare(env)
             fetch(env)
@@ -26,6 +25,11 @@ module Vx
 
         private
 
+          def enabled?(env)
+            puts env.cached_directories.inspect
+            !env.cached_directories.empty?
+          end
+
           def casher_cmd
             "test -f #{CASHER_BIN} && #{config.casher_ruby} #{CASHER_BIN}"
           end
@@ -73,7 +77,9 @@ module Vx
           end
 
           def add(env)
-            env.init << "#{casher_cmd} add $HOME/cached || true"
+            env.cached_directories.each do |d|
+              env.init << "#{casher_cmd} add #{d} || true"
+            end
             env.init << "unset CASHER_DIR"
           end
 

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

@@ -13,8 +13,8 @@ module Vx
             env.before_install.tap do |i|
               i << 'eval "$(rbenv init -)" || true'
               i << "rbenv shell #{make_rbenv_version_command env}"
-              i << "export BUNDLE_GEMFILE=${PWD}/#{gemfile(env)}"
-              i << 'export GEM_HOME=$HOME/cached/rubygems'
+              i << trace_sh_command("export BUNDLE_GEMFILE=${PWD}/#{gemfile(env)}")
+              i << trace_sh_command('export GEM_HOME=~/.rubygems')
             end
 
             env.announce.tap do |a|
@@ -27,6 +27,10 @@ module Vx
               i << trace_sh_command("bundle install")
               i << trace_sh_command("bundle clean --force")
             end
+
+            if env.source.cached_directories != false
+              env.cached_directories.push "~/.rubygems"
+            end
           end
 
           app.call(env)

data/lib/vx/builder/source.rb

@@ -52,6 +52,14 @@ module Vx
         attributes["env"]["global"]
       end
 
+      def cached_directories
+        if attributes["cache"] == false
+          false
+        else
+          (attributes["cache"] && attributes["cache"]["directories"]) || []
+        end
+      end
+
       AS_ARRAY.each do |m|
         define_method m do
           @attributes[m] || []

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.0.12"
+    VERSION = "0.0.13"
   end
 end

data/spec/fixtures/travis.yml

@@ -7,3 +7,7 @@ before_script:
 before_install:
   - "echo before_install"
 script: "RAILS_ENV=test ls -1 && echo DONE!"
+
+cache:
+  directories:
+  - ~/.cache

data/spec/lib/builder/configuration_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
 describe Vx::Builder::Configuration do
-  its(:logger)           { should be }
-  its(:casher_ruby)      { should be }
+  its(:casher_ruby) { should be }
 end

data/spec/lib/builder/script/cache_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Vx::Builder::Script::Cache do
+  let(:app)    { ->(env) { env } }
+  let(:script) { described_class.new app }
+  let(:env)    { create :env }
+  let(:run)    { script.call env }
+  subject { run }
+
+  it { should eq env }
+
+end

data/spec/lib/builder/script/ruby_spec.rb

@@ -1,25 +1,28 @@
 require 'spec_helper'
 
 describe Vx::Builder::Script::Ruby do
-  let(:app)    { ->(_) { 0 } }
+  let(:app)    { ->(env) { env } }
   let(:script) { described_class.new app }
   let(:env)    { create :env }
   let(:run)    { script.call env }
   subject { run }
 
-  it { should eq 0 }
+  it { should eq env }
 
   context "run it" do
     let(:command) { create :command_from_env, env: env }
-    before { run }
+    subject { env }
 
-    it "should be success" do
-      puts env
-      puts command
+    before { run }
 
-      system( command )
-      expect($?.to_i).to eq 0
+    context "should be success" do
+      its(:before_install)     { should_not be_empty }
+      its(:announce)           { should_not be_empty }
+      its(:install)            { should_not be_empty }
+      its(:cached_directories) {  should eq %w{ ~/.rubygems } }
     end
+
+
   end
 
 end

data/spec/lib/builder/source_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 
 describe Vx::Builder::Source do
-  let(:content) { YAML.load fixture('travis.yml') }
-  let(:config)  { described_class.from_attributes content }
+  let(:default_content) { YAML.load fixture('travis.yml') }
+  let(:content)         { default_content }
+  let(:config)          { described_class.from_attributes content }
   subject { config }
 
   its(:attributes)    { should be }
@@ -24,6 +25,27 @@ describe Vx::Builder::Source do
     end
   end
 
+  context "cached_directories" do
+    subject { config.cached_directories }
+    context "when cache is false" do
+      let(:content) { default_content.merge("cache" => false) }
+      it { should be_false }
+    end
+    context "when cache is nil" do
+      let(:content) { default_content.delete("cache") && default_content }
+      it { should eq [] }
+    end
+
+    context "when cache.directories is nil" do
+      let(:content) { default_content["cache"].delete("directories") && default_content }
+      it { should eq [] }
+    end
+
+    context "when exists" do
+      it { should eq ["~/.cache"] }
+    end
+  end
+
   context "(serialization)" do
 
     context "build new instance" do
@@ -31,6 +53,9 @@ describe Vx::Builder::Source do
         "rvm"            => ["2.0.0"],
         "gemfile"        => ["Gemfile"],
         "before_script"  => ["echo before_script"],
+        "cache"          => {
+          "directories"=>["~/.cache"]
+        },
         "before_install" => ["echo before_install"],
         "script"         => ["RAILS_ENV=test ls -1 && echo DONE!"],
         "env" => {
@@ -55,7 +80,10 @@ describe Vx::Builder::Source do
           gemfile:       "Gemfile",
           before_script: "echo before_script",
           before_install: "echo before_install",
-          script:        "RAILS_ENV=test ls -1 && echo DONE!"
+          script:        "RAILS_ENV=test ls -1 && echo DONE!",
+          cache: {
+            "directories" => ["~/.cache"]
+          }
         }}
         subject { described_class.from_attributes(attrs).attributes }
         it { should eq expected }

data/spec/lib/builder_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe Vx::Builder do
   subject { described_class }
 
-  its(:logger) { should be }
   its(:config) { should be }
 
   context ".configure" do

data/spec/support/create.rb

@@ -12,7 +12,8 @@ def create(name, options = {})
       msg.src,
       msg.sha,
       deploy_key: msg.deploy_key,
-      branch:     msg.branch
+      branch:     msg.branch,
+      cache_url_prefix: "http://example.com/"
     )
 
   when :source
@@ -29,7 +30,8 @@ def create(name, options = {})
       after_script:   [],
       source:         create(:source),
       task:           create(:task),
-      cache_key:      []
+      cache_key:      [],
+      cached_directories: []
     )
 
   when :command_from_env

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common
@@ -125,7 +125,6 @@ files:
 - lib/vx/builder.rb
 - lib/vx/builder/configuration.rb
 - lib/vx/builder/helper/config.rb
-- lib/vx/builder/helper/logger.rb
 - lib/vx/builder/helper/trace_sh_command.rb
 - lib/vx/builder/script.rb
 - lib/vx/builder/script/cache.rb
@@ -144,6 +143,7 @@ files:
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
 - spec/lib/builder/configuration_spec.rb
+- spec/lib/builder/script/cache_spec.rb
 - spec/lib/builder/script/env_spec.rb
 - spec/lib/builder/script/prepare_spec.rb
 - spec/lib/builder/script/ruby_spec.rb
@@ -185,6 +185,7 @@ test_files:
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
 - spec/lib/builder/configuration_spec.rb
+- spec/lib/builder/script/cache_spec.rb
 - spec/lib/builder/script/env_spec.rb
 - spec/lib/builder/script/prepare_spec.rb
 - spec/lib/builder/script/ruby_spec.rb

data/lib/vx/builder/helper/logger.rb

@@ -1,14 +0,0 @@
-module Vx
-  module Builder
-    module Helper
-      module Logger
-
-        def logger
-          Builder.logger
-        end
-
-      end
-
-    end
-  end
-end