wwtd 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ea58cf2ea3a962dbc5ed44866ba2ff5411de57e
-  data.tar.gz: 4803501289ed6fcbdf9e606855be37cf6e3b9454
+  metadata.gz: 61da2cf51ba1d01d93f74f8979a6114f74863592
+  data.tar.gz: ead0ba73395bb7f8180aece8665dbbbcbc5536a8
 SHA512:
-  metadata.gz: cf228f3b8f0136905943f05cae7802d925843bf7affcc51f6c07d93bec2c4a2de9781af9bf120ef6c2b9162a3024e5063a0e5921e7da9af2a16a50ce58e3e8a5
-  data.tar.gz: 13922b88b673cac8ca958e7c7ac4750072f53c78f21d4b267b0380806ea06cde560430dc41abdf374e3108ff7b367bb6fe49c9bcb97c107a7c2da7d8946529d4
+  metadata.gz: 07e972cabce7d8256374fd796f148c10cc827a7def79fc20079377ee6b844db1ebdaae4d504038253e7f7b15cee446b223e01cfdc8d84636a1f9fa99566246d5
+  data.tar.gz: d07e181e39e27b68816b2b3e8bcac1580b50abc3c64f2877fd7f01ff3f0f848400a0bf4e91ff314571b782ebfbea7f0165e3ffaec03cc5be3936477e7b130252

data/lib/wwtd.rb

@@ -18,7 +18,7 @@ module WWTD
     def read_travis_yml(options={})
       config = (File.exist?(CONFIG) ? YAML.load_file(CONFIG) : {})
       config.delete("source_key") # we don't need that we already have the source
-      ignored = (config.keys - UNDERSTOOD) + Array(options[:ignore])
+      ignored = (config.keys - UNDERSTOOD - Array(options[:use])) + Array(options[:ignore])
 
       calculate_local_ruby_matrix = (
         ignored.include?("rvm") &&
@@ -97,7 +97,16 @@ module WWTD
 
     def matrix(config)
       if config["env"] && config["env"].is_a?(Hash)
-        config["env"] = config["env"].values.map { |v| v.join(" ")}
+        global = if config["env"]["global"]
+          " " + config["env"]["global"].join(" ")
+        else
+          ""
+        end
+        if config["env"]["matrix"]
+          config["env"] = config["env"]["matrix"].map { |v| v + global }
+        else
+          config["env"] = global.strip
+        end
       end
 
       matrix = [{}]

data/lib/wwtd/cli.rb

@@ -33,7 +33,7 @@ module WWTD
           puts "\nFailed:"
           failed.each do |state, config|
             runner = WWTD::Run.new(config.merge(:rerun => true), {}, nil)
-            env, cmd = runner.env_and_command
+            env, cmd = runner.env_and_command_for_section("script")
             env = WWTD.escaped_env(env, :rerun => true)
             puts colorize(:red, env + cmd)
           end
@@ -60,7 +60,8 @@ module WWTD
 
       def parse_options(argv)
         options = {
-          :ignore => []
+          :ignore => [],
+          :use => [],
         }
         OptionParser.new do |opts|
           opts.banner = <<-BANNER.gsub(/^ {10}/, "")
@@ -73,6 +74,7 @@ module WWTD
           BANNER
           opts.on("-l", "--local", "Ignore rvm options / only run on current ruby") { options[:ignore] << "rvm" }
           opts.on("-i", "--ignore FIELDS", String, "Ignore selected travis fields like rvm/gemfile/matrix/...") { |fields| options[:ignore] += fields.split(",") }
+          opts.on("-u", "--use FIELDS", String, "Use dangerous travis fields like before_install/install/before_script/...") { |fields| options[:use] += fields.split(",") }
           opts.on("-p", "--parallel [COUNT]", Integer, "Run in parallel") { |c| options[:parallel] = c || 4 }
           opts.on("-o", "--only-bundle", "Only bundle, do not run anything") { options[:only_bundle] = true }
           opts.on("-h", "--help", "Show this.") { puts opts; exit }

data/lib/wwtd/ruby.rb

@@ -13,7 +13,7 @@ module WWTD
         return unless version
         version = normalize_ruby_version(version)
         if rvm_executable
-          command = "rvm #{version} do "
+          command = "rvm-exec #{version} "
           command if cache_command("#{command} ruby -v")
         elsif chruby_executable
           command = "chruby-exec #{version} -- "

data/lib/wwtd/run.rb

@@ -1,12 +1,15 @@
 module WWTD
   class Run
+
+    SCRIPT_SECTIONS = ["before_install", "install", "before_script", "script", "after_script"]
+
     def initialize(config, env, lock)
       @config, @env, @lock = config, env, lock
       add_env_from_config
       @switch = build_switch_statement
     end
 
-    def execute(&block)
+    def execute
       state = if Ruby.available?(config["rvm"])
         yield(:start, config)
         success? ? :success : :failure
@@ -20,20 +23,22 @@ module WWTD
     end
 
     # internal api
-    def env_and_command
-      default_command = (wants_bundle? ? "bundle exec rake" : "rake")
-      command = config["script"] || default_command
-      command = [command] unless Array === command
-      command = command.map { |cmd| "#{switch}#{cmd}" }.join(" && ")
-
-      [env, command]
+    def env_and_command_for_section(key)
+      if command = config[key]
+        command = [command] unless Array === command
+        command = command.map { |cmd| "#{switch}#{cmd}" }.join(" && ")
+
+        [env, command]
+      elsif key == "script"
+        command = (wants_bundle? ? "#{switch}bundle exec rake" : "#{switch}rake")
+        [env, command]
+      end
     end
 
     private
 
     attr_reader :config, :env, :lock, :switch
 
-
     def success?
       if wants_bundle?
         flock File.join(lock, (config["rvm"] || "rvm").to_s) do
@@ -43,7 +48,13 @@ module WWTD
         end
       end
 
-      sh(*env_and_command)
+      SCRIPT_SECTIONS.each do |section|
+        if env_and_command = env_and_command_for_section(section)
+          return unless sh(*env_and_command)
+        end
+      end
+
+      true
     end
 
     def wants_bundle?

data/lib/wwtd/version.rb

@@ -1,3 +1,3 @@
 module WWTD
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wwtd
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it