travis 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 818e03546d337ed230e406b1a939209b072a82f9
-  data.tar.gz: 32cb32ab8f1daeebeb9bb08206fbbc3ec654622d
+  metadata.gz: bf0bedc3ebeb0308526c8df70e1961f840b499a3
+  data.tar.gz: 42789765d91dc5975f884cc8f34468be355bf020
 SHA512:
-  metadata.gz: f8130d7c469792cbceee1e74b89c6e38ad711b01373602d93685714f938c9049cea784861977809b15aede3f2b0224f5887f448780cbd6ac7c0ad2a02792e66a
-  data.tar.gz: 6ca11f1d309263bf1caabeaebabc987a1861b5018f27d48758c028419ada2d20cb29c687196be4698936518456f66e3abbe1f259eb8a2a95df41202a2009d167
+  metadata.gz: 6e57f58c84db9bbe82efac4f7f35a4111730ac1fdb1c9ae9546c3d43f98353507bef69564382e126d71dfe10885428757af12a02be6dfbe6be66fc64308bb03e
+  data.tar.gz: 45aa4e29b71736c48bccb28e63d59609b75a0106749e8c53362108fd1e014a2b19041ac29d0179ca79fc1181bd5bfc837d97998e55e6f1663cce465059644df4

data/README.md

@@ -424,11 +424,17 @@ Outputs the public key for a repository.
     $ travis pubkey
     Public key for travis-ci/travis:
     
+    ssh-rsa ...
+    $ travis pubkey -r rails/rails > rails.key
+
+The `--pem` flag will print out the key PEM encoded:
+
+    $ travis pubkey --pem
+    Public key for travis-ci/travis:
+
     -----BEGIN PUBLIC KEY-----
     ...
     -----END PUBLIC KEY-----
-    
-    $ travis pubkey -r rails/rails > rails.key
 
 #### `restart`
 
@@ -902,6 +908,12 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 
 ## Version History
 
+**1.2.8** (July 19, 2013)
+
+* Make pubkey print out key in ssh encoding, add --pem flag for old format
+* Fix more encoding issues
+* Fix edge cases that broke history view
+
 **1.2.7** (July 15, 2013)
 
 * Add pubkey command

data/bin/travis

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+# :(
+Encoding.default_external = Encoding::UTF_8 if defined? Encoding
+
 require 'travis/cli'
 Travis::CLI.run(ARGV)

data/lib/travis/cli/command.rb

@@ -147,6 +147,8 @@ module Travis
           style ||= :important
           data = format % color(data, style) if format and interactive?
           data = data.gsub(/<\[\[/, '<%=').gsub(/\]\]>/, '%>')
+          data.encode! 'utf-8' if data.respond_to? :encode!
+          data
         end
 
         def template(*args)

data/lib/travis/cli/history.rb

@@ -36,7 +36,7 @@ module Travis
             color("##{build.number} #{build.state}:".ljust(16), [build.color, :bold]),
             color("#{build.branch_info} ", :info),
             build.commit.subject
-          ].join.strip
+          ].join.strip + "\n"
         end
     end
   end

data/lib/travis/cli/pubkey.rb

@@ -4,6 +4,8 @@ require 'travis/cli'
 module Travis
   module CLI
     class Pubkey < RepoCommand
+      on('-p', '--[no-]pem', 'encode in format used by pem')
+
       def run
         say key, "Public key for #{color(repository.slug, :info)}:\n\n%s", :bold
       end
@@ -11,7 +13,8 @@ module Travis
       private
 
         def key
-          repository.public_key.to_rsa.to_s
+          key = repository.public_key
+          pem? ? key.to_s : key.to_ssh
         end
     end
   end

data/lib/travis/client/repository.rb

@@ -17,6 +17,10 @@ module Travis
           Base64.encode64(encrypted).gsub(/\s+/, "")
         end
 
+        def to_ssh
+          ['ssh-rsa ', "\0\0\0\assh-rsa#{sized_bytes(to_rsa.e)}#{sized_bytes(to_rsa.n)}"].pack('a*m').gsub("\n", '')
+        end
+
         def to_rsa
           @to_rsa ||= OpenSSL::PKey::RSA.new(to_s)
         rescue OpenSSL::PKey::RSAError
@@ -27,6 +31,18 @@ module Travis
         def ==(other)
           other.to_s == self
         end
+
+        private
+
+          def sized_bytes(value)
+            bytes = to_byte_array(value.to_i)
+            [bytes.size, *bytes].pack('NC*')
+          end
+
+          def to_byte_array(num, *significant)
+            return significant if num.between?(-1, 0) and significant[0][7] == num[7]
+            to_byte_array(*num.divmod(256)) + significant
+          end
       end
 
       include States

data/lib/travis/version.rb

@@ -1,3 +1,3 @@
 module Travis
-  VERSION = '1.2.7'
+  VERSION = '1.2.8'
 end

data/travis.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # general infos
   s.name        = "travis"
-  s.version     = "1.2.7"
+  s.version     = "1.2.8"
   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.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Konstantin Haase
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday