diff options
author | Jan Stevens <jan@playpass.be> | 2015-08-20 12:36:40 +0300 |
---|---|---|
committer | Jan Stevens <jan@playpass.be> | 2015-08-20 12:36:40 +0300 |
commit | 66e4af2ad8251ca945a9e2a1398bc8ce2f29bdf3 (patch) | |
tree | 40e2802206ccab030afcf0645e7de6737016f432 /tasks | |
parent | e66545f886d0bab97e2b6c63cebbd03b993cb2e3 (diff) |
Renamed converter to updater since its an updater and does not convert anymore
Diffstat (limited to 'tasks')
-rw-r--r-- | tasks/updater.rb | 22 | ||||
-rw-r--r-- | tasks/updater/js_conversion.rb | 6 | ||||
-rw-r--r-- | tasks/updater/logger.rb | 2 | ||||
-rw-r--r-- | tasks/updater/network.rb | 4 | ||||
-rw-r--r-- | tasks/updater/scss_conversion.rb | 6 |
5 files changed, 21 insertions, 19 deletions
diff --git a/tasks/updater.rb b/tasks/updater.rb index 858183a..c7db6d6 100644 --- a/tasks/updater.rb +++ b/tasks/updater.rb @@ -21,19 +21,19 @@ require 'forwardable' require 'term/ansicolor' require 'fileutils' -require_relative 'converter/scss_conversion' -require_relative 'converter/js_conversion' -require_relative 'converter/logger' -require_relative 'converter/network' +require_relative 'updater/scss_conversion' +require_relative 'updater/js_conversion' +require_relative 'updater/logger' +require_relative 'updater/network' require 'bootstrap-sass/version' -class Converter +class Updater extend Forwardable include Network include JsConversion include ScssConversion - def initialize(repo: 'twbs/bootstrap', branch: 'master', save_to: {}, cache_path: 'tmp/converter-cache-bootstrap') + def initialize(repo: 'twbs/bootstrap', branch: 'master', save_to: {}, cache_path: 'tmp/bootstrap-cache') @logger = Logger.new @repo = repo @branch = branch || 'master' @@ -47,18 +47,20 @@ class Converter def_delegators :@logger, :log, :log_status, :log_processing, :log_transform, :log_file_info, :log_processed, :log_http_get_file, :log_http_get_files, :silence_log - def process_bootstrap - log_status "Convert Bootstrap LESS to Sass" + def update_bootstrap + log_status "Update Bootstrap" puts " repo : #@repo_url" puts " branch : #@branch_sha #@repo_url/tree/#@branch" puts " save to: #{@save_to.to_json}" puts " twbs cache: #{@cache_path}" puts '-' * 60 + FileUtils.rm_rf(@cache_path) + @save_to.each { |_, v| FileUtils.mkdir_p(v) } - process_scss_assets - process_javascript_assets + update_scss_assets + update_javascript_assets store_version end diff --git a/tasks/updater/js_conversion.rb b/tasks/updater/js_conversion.rb index 0bc322a..efcbff0 100644 --- a/tasks/updater/js_conversion.rb +++ b/tasks/updater/js_conversion.rb @@ -1,7 +1,7 @@ -class Converter +class Updater module JsConversion - def process_javascript_assets - log_status 'Processing javascripts...' + def update_javascript_assets + log_status 'Updating javascripts...' save_to = @save_to[:js] contents = {} read_files('js/dist', bootstrap_js_files).each do |name, file| diff --git a/tasks/updater/logger.rb b/tasks/updater/logger.rb index 66a9e31..660d90b 100644 --- a/tasks/updater/logger.rb +++ b/tasks/updater/logger.rb @@ -1,4 +1,4 @@ -class Converter +class Updater class Logger include Term::ANSIColor diff --git a/tasks/updater/network.rb b/tasks/updater/network.rb index cc60276..1b85b7a 100644 --- a/tasks/updater/network.rb +++ b/tasks/updater/network.rb @@ -1,5 +1,5 @@ require 'shellwords' -class Converter +class Updater module Network protected @@ -65,7 +65,7 @@ class Converter # get sha of the branch (= the latest commit) def get_branch_sha @branch_sha ||= begin - if @branch + "\n" == %x[git rev-parse #@branch] + if @branch + "\n" == %x[git rev-parse -- #@branch] @branch else cmd = "git ls-remote #{Shellwords.escape "https://github.com/#@repo"} #@branch" diff --git a/tasks/updater/scss_conversion.rb b/tasks/updater/scss_conversion.rb index c42782b..d885ff1 100644 --- a/tasks/updater/scss_conversion.rb +++ b/tasks/updater/scss_conversion.rb @@ -1,7 +1,7 @@ -class Converter +class Updater module ScssConversion - def process_scss_assets - log_status 'Processing scss...' + def update_scss_assets + log_status 'Updating scss...' save_to = @save_to[:scss] contents = {} read_files('scss', bootstrap_scss_files).each do |name, file| |