travis-extra 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b7ffe710000c01322ea7b62fc2b33234ddeb49c
-  data.tar.gz: 1075a94e3b43fe72e1edcdc2c86afd7e90e06c11
+  metadata.gz: 5ef789708050a539035a645afefa4e77e71d7e09
+  data.tar.gz: 2c8dba54f90fb46a8576d492271100be28f210e9
 SHA512:
-  metadata.gz: 54bd1e6e726c8d8503770cec5156dac23fc1d6b490048d7e3c4ea0c728ce34550514332c6c45b98f52f032af10bceef28a6f4ba9a8762f0618ffc7092aefb603
-  data.tar.gz: ca2c0aa1b70a2a357cb64842d7ffb2186f8e680e0b0d30220d6093082ff83329dff6f030f9c1500c3e7a2eb43555efd8f7999127add4f331be1d1fad2911f0dd
+  metadata.gz: a39f0cde80a8f1e76ac281a6aa577e0c3e9965d34202e169204912e7dc5404d06fad6d3547232696b982185a16adc0ac0d8b30c04fa9bb9be8cc4cc8ac8dd07e
+  data.tar.gz: c93334f75449abd9e19eb71c9eac69d58f16dd46a06642cf89be35a652cd55d110530cac55bb574ceab17c48e1f68f3ace1bf0bd37c302fd88894ea0be2023c0

data/.gitignore

@@ -0,0 +1 @@
+.DS_Store

data/.travis.yml

@@ -0,0 +1,31 @@
+language: ruby
+sudo: false
+
+env:
+  global:
+    # Rubygems API key
+    - secure: "Y3lnUlu44gQonk2kpCdz0DtWktgDC11FOyuJxmO2nG/eZkcK0SIsoWEiHZU29cwZ6F72TCxSf11r6XEH+Gu9zFK2c5XH+xEzM5tXQJnOC2JjJr+H5KZwB5//4MSWDmAPujoDoszyjT299BMa8LC801B+FnTg1g6LrEHHX+geHtENbU2O9lGVoIhsOFOgd+kk0V9Z+X3omw9Mv5nN2PapG3thw3yXzd38rT+c97/181co2wm4y8pHrutLKKQqc61xUHw3v/xIsPcYxSj9MqS0M5ULnIxxXV4RwfD2TZIuKPxrmoPW0PpoI/t7yg6JuM88r+wDAIhC8cT4g1wgwYW7PhvSV7o9HWWCWhNOMnDDdw/OWWKDw4G5+XpV4wRgyLm+HwXDSxVcIsXGDPITB0exeCin75oXCQZl9FDyC1i+qiM8cFTjUJo6IfnbfWViBDKSlOWpETgSI0Hr1tgtSDoKfTfdNIYLCmGvFcxsfNcHEYVJHF5NXEwcmWWcKiPBs+OBMbrGgY8mZ2zqPXYGywDav+Z5u1mzN7UUuHpixTYH0t6Es0MlUo0XILKNHtmohS1iQd0GwkgDXj3dtxKU3RA5NvLlD47gxuvuFqgC1KjQ+R3QaJ+hLboJPxz+zw3UahF8cmNV0cJY4qI6oi+RLpeWzSTH2Z9DqTqNyGVCWVNtYmU="
+
+script:
+  # Build and install this gem
+  - gem build travis-extra.gemspec
+  - gem install travis-extra-*.gem
+  
+  # Test basic situation with file parameter
+  - TRAVIS_BRANCH=master travis-extra --file=tests/basic.yml --load-env | grep "export WORLD=hello"
+  
+  # Test same file without file parameter
+  - cp tests/basic.yml .travis-extra.yml
+  - TRAVIS_BRANCH=develop travis-extra --load-env | grep "export SOMETHING=true ANYTHING=false"
+
+deploy:
+  - provider: rubygems
+    api_key: $RUBYGEMS_APIKEY
+    on:
+      repo: onnimonni/travis-extra
+      tags: true
+  - provider: rubygems
+    api_key: $RUBYGEMS_APIKEY
+    on:
+      repo: onnimonni/travis-extra
+      branch: master

data/Readme.md

@@ -1,4 +1,4 @@
-# travis-extra
+# travis-extra [![Build Status](https://travis-ci.org/onnimonni/travis-extra.svg?branch=master)](https://travis-ci.org/onnimonni/travis-extra) [![Gem Version](https://badge.fury.io/rb/travis-extra.svg)](http://badge.fury.io/rb/travis-extra)
 
 Helper script for doing more with Travis CI. It reads `.travis-extra.yml` file from current directory and exports environmental variables for your CI run.
 
@@ -25,5 +25,11 @@ You can load them by running:
 $ eval $(travis-extra --load-env)
 ```
 
+### Specify custom config file
+You can use `--file` flag to specify custom config file
+```
+$ travis-extra --file=config/extra.yml
+```
+
 ## License
 MIT

data/lib/travis-extra/cli.rb

@@ -31,7 +31,7 @@ module TravisExtra
     def run
 
       begin
-        config = Config.parse
+        config = Config.parse(options)
       rescue ConfigNotFoundError => e
         STDERR.puts "Error: #{e.message}"
         exit 1

data/lib/travis-extra/config.rb

@@ -2,15 +2,18 @@ require 'yaml'
 
 module TravisExtra
   class Config
-    def self.parse(*args)
-      CONFIG_FILES.each do |file|
-        if File.exist?(file)
-          return YAML.load_file(file)
+    def self.parse(args)
+      if args[:file]
+        return YAML.load_file(args[:file]) if File.exist?(args[:file])
+        raise ConfigNotFoundError, "#{args[:file]} not found"  
+      else
+        CONFIG_FILES.each do |file|
+          return YAML.load_file(file) if File.exist?(file)
         end
+        raise ConfigNotFoundError, "./.travis-extra.yml not found"
       end
-      raise ConfigNotFoundError, "./.travis-extra.yml not found"
     end
 
-    CONFIG_FILES=%w[ .travis-extra.yml, .travis-extra.yaml ]
+    CONFIG_FILES=%w[ .travis-extra.yml .travis-extra.yaml ]
   end
 end

data/lib/travis-extra/environment.rb

@@ -7,7 +7,8 @@ module TravisExtra
     end
 
     def initialize(config)
-      if config['branch'].key?(ENV['TRAVIS_BRANCH'])
+      @env = {}
+      if config['branch'][ENV['TRAVIS_BRANCH']]
         @env = config['branch'][ENV['TRAVIS_BRANCH']]
       end
     end

data/lib/travis-extra/version.rb

@@ -1,3 +1,3 @@
 module TravisExtra
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/tests/basic.yml

@@ -0,0 +1,7 @@
+env:
+  branch:
+    master:
+      WORLD: hello
+    develop:
+      SOMETHING: true
+      ANYTHING: false

data/travis-extra.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.require_path          = 'lib'
   s.required_ruby_version = '>= 1.9.3'
 
-  # prereleases from Travis CI
-  if ENV['CI']
+  # prereleases from Travis CI for builds when tag is not set
+  if ENV['CI'] and not ENV['TRAVIS_TAG']
     digits = s.version.to_s.split '.'
     digits[-1] = digits[-1].to_s.succ
     s.version = digits.join('.') + ".travis.#{ENV['TRAVIS_JOB_NUMBER']}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis-extra
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Onni Hakala
@@ -17,6 +17,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - Readme.md
@@ -26,6 +28,7 @@ files:
 - lib/travis-extra/environment.rb
 - lib/travis-extra/errors.rb
 - lib/travis-extra/version.rb
+- tests/basic.yml
 - travis-extra.gemspec
 homepage: https://github.com/onnimonni/travis-extra
 licenses:
@@ -47,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: helper for travis ci