vx-builder 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73e96e0bf3f8cc5311180c68c24f8ce2b91b2cb5
-  data.tar.gz: de07a671e32eaecfca0ffc59bebcf0334ae673ad
+  metadata.gz: dfbe290e0979d13dc2247256846a0a7bbb4cffa3
+  data.tar.gz: 0ef71474e8232fcc4891dc752d4f28790d1652fb
 SHA512:
-  metadata.gz: 4391e8339e7f1250acddf347442cfcbfe64bc6f04523f4edfe8805120cfec41a69ad127e59ec1c49e493bb52e0a5e461da2aec82c6eccd00452af0b63e2e784b
-  data.tar.gz: a8b3b91466510b7bfc586a3993e1a40478a8338c4c3f45b4e7c6ad77ed1ce99720d606eba264b1a73986f8fe24398a68f77926cb4fdfd66f1560417400d6946f
+  metadata.gz: aab68e031514142fb618bb6dfd7a7125e900c36ea67021d2a550417251fd62241c93e4b119ecca3123ed62c6f7b58bab918b5449371e96b4c6ee8ee45798df0e
+  data.tar.gz: 790cc4d61325fba00d62b8fddafb752b2737fb076bd11c455a21a9e8eb5f35c35b275a5faab9669284910e77c9be262fa17339072916b1ecf84a963fc7a1d1f4

data/lib/vx/builder/configuration.rb

@@ -11,9 +11,8 @@ module Vx
       self.env_namespace = 'vx'
       self.raise_missing_keys = true
 
-      define logger:            Common::TaggedLogging.new(Logger.new STDOUT),
-             webdav_cache_url:  nil,
-             casher_ruby:       "/usr/local/rbenv/versions/1.9.3-p484/bin/ruby"
+      define logger:      Common::TaggedLogging.new(Logger.new STDOUT),
+             casher_ruby: "/usr/local/rbenv/versions/1.9.3-p484/bin/ruby"
 
     end
   end

data/lib/vx/builder/script/{webdav_cache.rb → cache.rb}

@@ -2,7 +2,7 @@ module Vx
   module Builder
     class Script
 
-      WebdavCache = Struct.new(:app) do
+      Cache = Struct.new(:app) do
 
         include Helper::Config
         include Helper::Logger
@@ -13,7 +13,7 @@ module Vx
         def call(env)
           rs = app.call env
 
-          if config.webdav_cache_url
+          if env.task.cache_url_prefix
             assign_url_to_env(env)
             prepare(env)
             fetch(env)
@@ -38,16 +38,16 @@ module Vx
             end
             urls << url_for(env, 'master')
 
-            env.webdav_fetch_url = urls
-            env.webdav_push_url  = url_for(env, branch)
+            env.cache_fetch_url = urls
+            env.cache_push_url  = url_for(env, branch)
             env
           end
 
           def url_for(env, branch)
-            name = env.task.name.dup + "/" + branch
+            name = branch
 
             key = env.cache_key.join("-").gsub(/[^a-z0-9_\-.]/, '-')
-            "#{config.webdav_cache_url}/#{name}/#{key}.tgz"
+            "#{env.task.cache_url_prefix}/#{name}/#{key}.tgz"
           end
 
           def prepare(env)
@@ -62,7 +62,7 @@ module Vx
           end
 
           def fetch(env)
-            urls = env.webdav_fetch_url.join(" ")
+            urls = env.cache_fetch_url.join(" ")
             env.init << "#{casher_cmd} fetch #{urls} || true"
           end
 
@@ -72,8 +72,8 @@ module Vx
           end
 
           def push(env)
-            if env.webdav_push_url
-              env.after_script << "#{casher_cmd} push #{env.webdav_push_url}"
+            if env.cache_push_url
+              env.after_script << "#{casher_cmd} push #{env.cache_push_url}"
             end
           end
 

data/lib/vx/builder/script.rb

@@ -9,13 +9,13 @@ module Vx
       autoload :Script,       File.expand_path("../script/script",        __FILE__)
       autoload :Prepare,      File.expand_path("../script/prepare",       __FILE__)
       autoload :Databases,    File.expand_path("../script/databases",     __FILE__)
-      autoload :WebdavCache,  File.expand_path("../script/webdav_cache",  __FILE__)
+      autoload :Cache,        File.expand_path("../script/cache",         __FILE__)
       autoload :Services,     File.expand_path("../script/services",      __FILE__)
 
       include Common::Helper::Middlewares
 
       middlewares do
-        use Builder::Script::WebdavCache
+        use Builder::Script::Cache
         use Builder::Script::Services
         use Builder::Script::Env
         use Builder::Script::Prepare

data/lib/vx/builder/task.rb

@@ -2,15 +2,17 @@ module Vx
   module Builder
     class Task
 
-      attr_reader :name, :src, :sha, :deploy_key, :branch, :pull_request_id
+      attr_reader :name, :src, :sha, :deploy_key, :branch, :pull_request_id,
+        :cache_url_prefix
 
       def initialize(name, src, sha, options = {})
-        @name            = name
-        @src             = src
-        @sha             = sha
-        @deploy_key      = options[:deploy_key]
-        @branch          = options[:branch]
-        @pull_request_id = options[:pull_request_id]
+        @name             = name
+        @src              = src
+        @sha              = sha
+        @deploy_key       = options[:deploy_key]
+        @branch           = options[:branch]
+        @pull_request_id  = options[:pull_request_id]
+        @cache_url_prefix = options[:cache_url_prefix]
 
         validate!
       end

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/lib/builder/configuration_spec.rb

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

data/spec/lib/builder/task_spec.rb

@@ -8,7 +8,8 @@ describe Vx::Builder::Task do
       'source',
       'sha',
       deploy_key: 'deploy_key',
-      pull_request_id: '1'
+      pull_request_id: '1',
+      cache_url_prefix: 'cache_url'
     )
   }
 
@@ -20,6 +21,7 @@ describe Vx::Builder::Task do
     let(:sha)             { should eq 'sha' }
     let(:deploy_key)      { should eq 'deploy_key' }
     let(:pull_request_id) { should eq '1' }
+    let(:cache_url_prefix){ should eq 'cache_url' }
   end
 
 end

data/spec/support/create.rb

@@ -6,7 +6,8 @@ def create(name, options = {})
       'src',
       'sha',
       deploy_key: 'deploy_key',
-      branch: 'master'
+      branch: 'master',
+      cache_url_prefix: "http://localhost"
     )
   when :source
     Vx::Builder::Source.from_yaml(fixture("travis.yml"))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common
@@ -128,12 +128,12 @@ files:
 - 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
 - lib/vx/builder/script/env.rb
 - lib/vx/builder/script/prepare.rb
 - lib/vx/builder/script/ruby.rb
 - lib/vx/builder/script/script.rb
 - lib/vx/builder/script/services.rb
-- lib/vx/builder/script/webdav_cache.rb
 - lib/vx/builder/source.rb
 - lib/vx/builder/source/constants.rb
 - lib/vx/builder/source/matrix.rb