travish 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12144020c1876ce458915666248c1ad1bab89c58
-  data.tar.gz: afa69742dba43ef5d14ab1f1a2eb23cecc717928
+  metadata.gz: c366abeba5827d1aebfcd355aef252f83182b168
+  data.tar.gz: bba5edc2c510e5285ceeb08589bfce8c030bf4df
 SHA512:
-  metadata.gz: 39b45b24431a25332328c1c359329f50a38232e0349912adaf737afa4c642f4b49d0b73ec7879a06996359b360365da0a7d88d78e1439a3225f1599a395481e4
-  data.tar.gz: c1dd864ab13889a2162f259b5f2bd0bb5c3a1e3111d54b28e68a3a8bd01a4fc09f91470ca042ed5ae1cbe9a856b6a9e8220f164d99500af9d4d7e3c100337953
+  metadata.gz: 601836afba0897ae33cebbb573b6f29cce17b8c749ea34921a1202e6dffde3d833b0452cf708161a8e7b67691dedb56fb6f6a2baf28b3c1630e3ebab330dbba6
+  data.tar.gz: d6b874ddd50cf66eb78aa9d5e4c2a91e93b162530bffd202af5ca8e4300946144d2568cd7f1c688dcabbe17ee40232c534c1faf658cad2bb6c137beb0fb0960b

data/Gemfile

@@ -11,4 +11,5 @@ group :development do
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 2.0.1"
   gem "simplecov", ">= 0"
+  gem 'rspec', '~> 3.2.0'
 end

data/Gemfile.lock

@@ -11,6 +11,7 @@ GEM
     builder (3.2.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
     docile (1.1.5)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
@@ -54,6 +55,19 @@ GEM
     rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.2)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
@@ -76,5 +90,6 @@ DEPENDENCIES
   bundler (~> 1.0)
   jeweler (~> 2.0.1)
   rdoc (~> 3.12)
+  rspec (~> 3.2.0)
   shoulda
   simplecov

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/lib/environment_parser.rb

@@ -0,0 +1,75 @@
+module Travish
+  # Handles parsing the environment from a .travis.yml file
+  # and merging it with overrides from other source such as
+  # ENV
+  class EnvironmentParser
+    STRING_REG_EX = /^(.+)="?(.+?)"?$/
+
+    attr_accessor :environment_hash
+
+    # Create a new instance of `EnvironmentParser`
+    def initialize(env, *args)
+      @env = env
+      @env = [@env] if @env.is_a? String
+      @override_envs = args
+      @override_envs ||= []
+    end
+
+    # The resulting environment hash after merging
+    # the environment from the travis file with
+    # the specified overrides. This method is lazy
+    # and calculates its result on the first call
+    def environment_hash
+      @environment_hash ||= build_environment_hash
+    end
+
+    private
+
+    # Build the environment hash by extracting the environment
+    # variables from the provided travis environment and merging
+    # with any provided overrides
+    def build_environment_hash
+      parsed_variables = {}
+      @env.each do |env_row|
+        # Each row can potentially contain multiple environment
+        # variables
+        variables = extract_variables(env_row)
+
+        variables.each do |variables_with_values|
+          variables_with_values.each do |key, value|
+            parsed_variables[key] = value
+          end
+        end
+      end
+
+      @override_envs.each do |env|
+        parsed_variables = parsed_variables.merge env
+      end
+
+      parsed_variables
+    end
+
+    # Extract environment variables from a value
+    # The value is expected to be either a hash or a string with
+    # one or more key value pairs on the form
+    #   KEY=VALUE
+    def extract_variables(variable)
+      return [variable] if variable.is_a? Hash
+      return extract_variables_from_string(variable) if variable.is_a? String
+
+      []
+    end
+
+    # Extract variables from a string on the form
+    #   KEY1=VALUE1 KEY2="VALUE2"
+    # Optional quoting around the value is allowed
+    def extract_variables_from_string(string)
+      string.split(/ /).map do |defintion|
+        match = defintion.match STRING_REG_EX
+        next nil unless match
+
+        { match[1] => match[2] }
+      end.reject(&:nil?)
+    end
+  end
+end

data/lib/travish.rb

@@ -1,9 +1,10 @@
 require "rubygems"
 require 'yaml'
+require 'environment_parser'
 
 module Travish
   class Runner
-    
+
     def help
       puts ""
       puts "Travish - emulates the OSX experience for travis."
@@ -12,52 +13,55 @@ module Travish
       puts ""
       puts "                                               ./"
     end
-      
+
     def run
       validate
-      environment = default_yml.merge local_travis_yml
-      
-      run_commands environment["before_install"]
-      run_commands environment["install"]
-      run_commands environment["before_script"]
-      run_commands environment["script"]
-    end
-    
+      travis_file = default_yml.merge local_travis_yml
+      parser = EnvironmentParser.new(travis_file['env']['global'], ENV)
+
+      run_commands(travis_file["before_install"], parser.environment_hash)
+      run_commands(travis_file["install"], parser.environment_hash)
+      run_commands(travis_file["before_script"], parser.environment_hash)
+      run_commands(travis_file["script"], parser.environment_hash)
+    end
+
     # -- faffing
-    
+
     def initialize(args)
       # find a command
       @params = args
       command = @params[0].to_sym rescue :help
       commands.include?(command) ? send(command.to_sym) : help
     end
-    
+
     private
-    
-    def run_commands array
+
+    def run_commands(array, environment = {})
+      return if array.nil?
+      array = [array] if array.is_a?(String)
       array.each do |command|
-        system command
+        puts "> " + command
+        system(environment, command)
       end
     end
-    
+
     def local_travis_yml
       YAML.load_file('.travis.yml')
     end
-    
+
     def default_yml
       {}
     end
-    
+
     def validate
       unless File.exists? ".travis.yml"
         puts "You need to have a `travis.yml` in this folder."
         exit
       end
     end
-    
+
     def commands
       (public_methods - Object.public_methods).sort.map{ |c| c.to_sym }
     end
-    
-  end  
+  end
 end

data/spec/environment_parser_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require_relative '../lib/environment_parser.rb'
+
+module Travish
+  RSpec.describe EnvironmentParser do
+    describe '.environment_hash' do
+      let(:global_env) do
+        [
+          'KEY1=VALUE1 KEY2=VALUE2',
+          { 'KEY3' => 'VALUE3' },
+          'KEY_WITH_QUOTED_VALUE="QUOTED"'
+        ]
+      end
+
+      let(:overrides) do
+        [
+          { 'KEY1' => 'V1', 'KEY2' => 'V2', 'KEY3' => 'not V3' },
+          { 'KEY3' => 'V3' }
+        ]
+      end
+
+      it 'produces the correct result without overrides' do
+        parser = described_class.new(global_env)
+        hash = parser.environment_hash
+
+        expect(hash).to eq('KEY1' => 'VALUE1',
+                           'KEY2' => 'VALUE2',
+                           'KEY3' => 'VALUE3',
+                           'KEY_WITH_QUOTED_VALUE' => 'QUOTED')
+      end
+
+      it 'produces the corect result with overrides' do
+        parser = described_class.new(global_env, *overrides)
+        hash = parser.environment_hash
+
+        expect(hash).to eq('KEY1' => 'V1', 'KEY2' => 'V2',
+                           'KEY3' => 'V3', 'KEY_WITH_QUOTED_VALUE' => 'QUOTED')
+      end
+
+      it 'produces the correct result with a single string as the environment' do
+        parser = described_class.new('KEY=VALUE OTHER_KEY="OTHER_VALUE"')
+        hash = parser.environment_hash
+
+        expect(hash).to eq('KEY' => 'VALUE', 'OTHER_KEY' => 'OTHER_VALUE')
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'rspec'

data/travish.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: travish 0.0.1 ruby lib
+# stub: travish 0.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "travish"
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Orta Therox"]
-  s.date = "2015-03-26"
+  s.date = "2015-04-07"
   s.description = " Emulates a tiny subset of the travis workflow for running your own CI based on the .travis.yml "
   s.email = "orta.therox@gmail.com"
   s.executables = ["travish"]
@@ -28,9 +28,10 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/travish",
+    "lib/environment_parser.rb",
     "lib/travish.rb",
-    "test/helper.rb",
-    "test/test_travish.rb",
+    "spec/environment_parser_spec.rb",
+    "spec/spec_helper.rb",
     "travish.gemspec"
   ]
   s.homepage = "http://github.com/orta/travish"
@@ -47,12 +48,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.2.0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 3.2.0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
@@ -60,6 +63,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 3.2.0"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travish
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Orta Therox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: " Emulates a tiny subset of the travis workflow for running your own
   CI based on the .travis.yml "
 email: orta.therox@gmail.com
@@ -98,9 +112,10 @@ files:
 - Rakefile
 - VERSION
 - bin/travish
+- lib/environment_parser.rb
 - lib/travish.rb
-- test/helper.rb
-- test/test_travish.rb
+- spec/environment_parser_spec.rb
+- spec/spec_helper.rb
 - travish.gemspec
 homepage: http://github.com/orta/travish
 licenses:

data/test/helper.rb

@@ -1,34 +0,0 @@
-require 'simplecov'
-
-module SimpleCov::Configuration
-  def clean_filters
-    @filters = []
-  end
-end
-
-SimpleCov.configure do
-  clean_filters
-  load_adapter 'test_frameworks'
-end
-
-ENV["COVERAGE"] && SimpleCov.start do
-  add_filter "/.rvm/"
-end
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'travish'
-
-class Test::Unit::TestCase
-end

data/test/test_travish.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestTravish < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end