travis 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48ae038ebc8fe65bc53a3e6ed066bb28e7d6cfd2
-  data.tar.gz: 62c2594506f70fecd4a968845874ec0f437e5554
+  metadata.gz: cda21789737990f798f8234501d7973bdf75c90f
+  data.tar.gz: 86ea0816fb1f70c7784c4f5628e111639e5bb72f
 SHA512:
-  metadata.gz: c1ec04404b5187033308316c51eeb9d70dd566b095d75ef59ac3016a1cf9d3c5a35306fcf7268dff45e616888c3658fb7ec4c2e1b8fad88d54fc3ef438fe430d
-  data.tar.gz: 9640638761e3e557fd4751c2386afed2b72b6add16ab1f1437e53dd216c703c7ef5a11454b81aee122e04cac6dfb2f4b5d35203adf69660fd7afab0d332ee0ad
+  metadata.gz: 24524107e5fe9b919e8a40dfb1734780fe06abcefc9342493e56fc300d00a103f1c6fa9b802b22a20597fc8ac09fcf19fb614fa75b5659cfa171dd72bf585f41
+  data.tar.gz: dc95bcb8417bfcbd86a3ed237d214a8546c4a5ea05212cf3f961cfbb74ddfbdd718d3657471e91a39d4695c06db7255cefc7ee5a73f83adbb096aaaefa6c6b4d

data/README.md

@@ -888,6 +888,11 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 
 ## Version History
 
+**v1.2.2** (May 24, 2013)
+
+* Fixed `travis disable`.
+* Fix edge cases around `travis encrypt`.
+
 **v1.2.1** (May 24, 2013)
 
 * Builds with high build numbers are properly aligned when running `travis history`.

data/lib/travis/cli/disable.rb

@@ -5,7 +5,7 @@ module Travis
     class Disable < RepoCommand
       def run
         authenticate
-        repository.enable
+        repository.disable
         say "disabled", color("#{slug}: %s :(", :error)
       end
     end

data/lib/travis/cli/encrypt.rb

@@ -32,15 +32,7 @@ module Travis
         encrypted = data.map { |data| repository.encrypt(data) }
 
         if config_key
-          travis_config = YAML.load_file(travis_yaml)
-          travis_config = {} if [[], false, nil].include? travis_config
-          keys          = config_key.split('.')
-          last_key      = keys.pop
-          nested_config = keys.inject(travis_config) { |c,k| c[k] ||= {}}
-          nested_config = nested_config[last_key] ||= []
-          encrypted.each do |encrypted|
-             nested_config << { 'secure' => encrypted }
-          end
+          set_config encrypted.map { |e| { 'secure' => e } }
           File.write(travis_yaml, travis_config.to_yaml)
         else
           list = encrypted.map { |data| format(data.inspect, "  secure: %s") }
@@ -50,6 +42,52 @@ module Travis
 
       private
 
+        def travis_config
+          @travis_config ||= begin
+            payload = YAML.load_file(travis_yaml)
+            payload.respond_to?(:to_hash) ? payload.to_hash : {}
+          end
+        end
+
+        def set_config(result)
+          parent_config[last_key] = merge_config(result)
+        end
+
+        def merge_config(result)
+          case subconfig = parent_config[last_key]
+          when nil   then result.size == 1 ? result.first : result
+          when Array then subconfig + result
+          else            result.unshift(subconfig)
+          end
+        end
+
+        def subconfig
+        end
+
+        def key_chain
+          @key_chain ||= config_key.split('.')
+        end
+
+        def last_key
+          key_chain.last
+        end
+
+        def parent_config
+          @parent_config ||= traverse_config(travis_config, *key_chain[0..-2])
+        end
+
+        def traverse_config(hash, key = nil, *rest)
+          return hash unless key
+
+          hash[key] = case value = hash[key]
+                      when nil  then {}
+                      when Hash then value
+                      else { 'matrix' => Array(value) }
+                      end
+
+          traverse_config(hash[key], *rest)
+        end
+
         def travis_yaml(dir = Dir.pwd)
           path = File.expand_path('.travis.yml', dir)
           if File.exist? path

data/lib/travis/version.rb

@@ -1,3 +1,3 @@
 module Travis
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/travis.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # general infos
   s.name        = "travis"
-  s.version     = "1.2.1"
+  s.version     = "1.2.2"
   s.description = "CLI and Ruby client library for Travis CI"
   s.homepage    = "https://github.com/travis-ci/travis"
   s.summary     = "Travis CI client"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Konstantin Haase