travis 1.4.0 → 1.5.0

data/lib/travis/client/methods.rb

@@ -67,12 +67,22 @@ module Travis
         session.find_many(Account)
       end
 
+      def broadcasts
+        session.find_many(Broadcast)
+      end
+
       def restart(entity)
         # btw, internally we call this reset, not restart, as it resets the state machine
         # but we thought that would be too confusing
         session.post_raw('/requests', "#{entity.class.one}_id" => entity.id)
         entity.reload
       end
+
+      def listen(*entities, &block)
+        listener = Listener.new(session)
+        listener.subscribe(*entities, &block)
+        listener.listen
+      end
     end
   end
 end

data/lib/travis/client/repository.rb

@@ -55,7 +55,7 @@ module Travis
 
       one  :repo
       many :repos
-      aka  :repository
+      aka  :repository, :permissions
 
       def public_key
         attributes["public_key"] ||= begin
@@ -154,6 +154,14 @@ module Travis
         set_hook(true)
       end
 
+      def pusher_channels
+        attributes['pusher_channels'] ||= if session.private_channels?
+          ["user-#{session.user.id}", "repo-#{id}"]
+        else
+          ["common"]
+        end
+      end
+
       private
 
         def state

data/lib/travis/client/session.rb

@@ -170,6 +170,10 @@ module Travis
         instruments << block
       end
 
+      def private_channels?
+        access_token and user.channels != ['common']
+      end
+
       private
 
         def instrumented(name, *args)
@@ -182,6 +186,7 @@ module Travis
         end
 
         def create_entity(type, data)
+          data   = { "id" => data } if Integer === data or String === data
           id     = type.cast_id(data.fetch('id'))
           entity = cached(type, :id, id) { type.new(self, id) }
           entity.update_attributes(data)

data/lib/travis/client/user.rb

@@ -4,7 +4,7 @@ module Travis
   module Client
     class User < Entity
       # @!parse attr_reader :login, :name, :email, :gravatar_id, :locale, :is_syncing, :synced_at, :correct_scopes
-      attributes :login, :name, :email, :gravatar_id, :locale, :is_syncing, :synced_at, :correct_scopes
+      attributes :login, :name, :email, :gravatar_id, :locale, :is_syncing, :synced_at, :correct_scopes, :channels
       inspect_info :login
 
       one  :user
@@ -19,6 +19,15 @@ module Travis
         reload
       end
 
+      def channels
+        load_attribute(:is_syncing) # dummy to trigger load, as channels might not be included
+        attributes['channels'] ||= ['common']
+      end
+
+      def repositories
+        attributes['repositories'] ||= session.get('/users/permissions')['permissions']
+      end
+
       alias syncing? is_syncing
       alias correct_scopes? correct_scopes
     end

data/lib/travis/tools/safe_string.rb

@@ -0,0 +1,20 @@
+module Travis
+  module Tools
+    module SafeString
+      extend self
+
+      def encoded(string)
+        return string unless string.respond_to? :encode
+        string.encode 'utf-8'
+      end
+
+      def colorized(string)
+        encoded(string).gsub(/[^[:print:]\e\n]/, '')
+      end
+
+      def clean(string)
+        colorized(string).gsub(/\e[^m]+m/, '')
+      end
+    end
+  end
+end

data/lib/travis/version.rb

@@ -1,3 +1,3 @@
 module Travis
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/spec/cli/encrypt_spec.rb

@@ -35,4 +35,9 @@ describe Travis::CLI::Endpoint do
     run_cli('encrypt', 'rails/rails', 'foo').should be_success
     stderr.should match(/WARNING/)
   end
+
+  example "travis encrypt foo=foo/bar" do
+    run_cli("encrypt", "foo=foo/bar").should be_success
+    stderr.should_not match(/WARNING/)
+  end
 end

data/spec/cli/restart_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Travis::CLI::Open do
   example 'travis restart' do
-    run_cli('restart').should be_success
+    run_cli('restart', '-t', 'token').should be_success
     $params['build_id'].should be == "4125095"
     $params['job_id'].should be_nil
   end
 
   example 'travis restart 6180.1' do
-    run_cli('restart', '6180.1').should be_success
+    run_cli('restart', '6180.1', '-t', 'token').should be_success
     $params['build_id'].should be_nil
     $params['job_id'].should be == "4125096"
   end

data/spec/client/broadcast_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Travis::Client::Broadcast do
+  let(:session) { Travis::Client.new }
+  subject { session.broadcasts.first }
+
+  its(:id) { should be == 1 }
+  its(:message) { should be == "Hello!" }
+
+end

data/spec/support/fake_api.rb

@@ -715,6 +715,13 @@ module Travis
           }]}.to_json
         end
 
+        get '/broadcasts/' do
+          {"broadcasts"=>
+          [{'id' => 1,
+            'message' => 'Hello!'
+          }]}.to_json
+        end
+
         post '/requests' do
           $params = params
           "{}"

data/travis.gemspec

@@ -2,12 +2,13 @@
 Gem::Specification.new do |s|
   # general infos
   s.name        = "travis"
-  s.version     = "1.4.0"
+  s.version     = "1.5.0"
   s.description = "CLI and Ruby client library for Travis CI"
   s.homepage    = "https://github.com/travis-ci/travis"
   s.summary     = "Travis CI client"
   s.license     = "MIT"
   s.executables = ["travis"]
+  s.extensions  = ["completion/extconf.rb"]
 
   # generated from git shortlog -sn
   s.authors = [
@@ -15,13 +16,15 @@ Gem::Specification.new do |s|
     "Henrik Hodne",
     "Peter Souter",
     "Max Barnash",
-    "Mario Visic",
+    "Aaron Hill",
+    "Justin Lambert",
+    "Adrien Brault",
+    "Laurent Petit",
+    "Daniel Chatfield",
     "Piotr Sarnacki",
     "Rapha\xC3\xABl Pinson",
-    "Laurent Petit",
-    "Adrien Brault",
-    "Justin Lambert",
-    "Aaron Hill"
+    "Mario Visic",
+    "Benjamin Manns"
   ]
 
   # generated from git shortlog -sne
@@ -30,13 +33,15 @@ Gem::Specification.new do |s|
     "me@henrikhodne.com",
     "p.morsou@gmail.com",
     "i.am@anhero.ru",
+    "aa1ronham@gmail.com",
+    "benmanns@gmail.com",
+    "adrien.brault@gmail.com",
+    "laurent.petit@gmail.com",
+    "chatfielddaniel@gmail.com",
     "drogus@gmail.com",
     "raphael.pinson@camptocamp.com",
-    "laurent.petit@gmail.com",
-    "adrien.brault@gmail.com",
-    "jlambert@eml.cc",
-    "aa1ronham@gmail.com",
-    "mario@mariovisic.com"
+    "mario@mariovisic.com",
+    "jlambert@eml.cc"
   ]
 
   # generated from git ls-files
@@ -45,10 +50,13 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "bin/travis",
+    "completion/extconf.rb",
+    "completion/travis.sh",
     "example/org_overview.rb",
     "lib/travis.rb",
     "lib/travis/cacert.pem",
     "lib/travis/cli.rb",
+    "lib/travis/cli/accounts.rb",
     "lib/travis/cli/api_command.rb",
     "lib/travis/cli/branches.rb",
     "lib/travis/cli/command.rb",
@@ -77,6 +85,7 @@ Gem::Specification.new do |s|
     "lib/travis/cli/init/scala.yml",
     "lib/travis/cli/login.rb",
     "lib/travis/cli/logs.rb",
+    "lib/travis/cli/monitor.rb",
     "lib/travis/cli/open.rb",
     "lib/travis/cli/parser.rb",
     "lib/travis/cli/pubkey.rb",
@@ -94,11 +103,13 @@ Gem::Specification.new do |s|
     "lib/travis/client.rb",
     "lib/travis/client/account.rb",
     "lib/travis/client/artifact.rb",
+    "lib/travis/client/broadcast.rb",
     "lib/travis/client/build.rb",
     "lib/travis/client/commit.rb",
     "lib/travis/client/entity.rb",
     "lib/travis/client/error.rb",
     "lib/travis/client/job.rb",
+    "lib/travis/client/listener.rb",
     "lib/travis/client/methods.rb",
     "lib/travis/client/namespace.rb",
     "lib/travis/client/repository.rb",
@@ -108,6 +119,7 @@ Gem::Specification.new do |s|
     "lib/travis/client/worker.rb",
     "lib/travis/pro.rb",
     "lib/travis/tools/formatter.rb",
+    "lib/travis/tools/safe_string.rb",
     "lib/travis/tools/token_finder.rb",
     "lib/travis/version.rb",
     "spec/cli/encrypt_spec.rb",
@@ -125,6 +137,7 @@ Gem::Specification.new do |s|
     "spec/cli/version_spec.rb",
     "spec/cli/whoami_spec.rb",
     "spec/client/account_spec.rb",
+    "spec/client/broadcast_spec.rb",
     "spec/client/build_spec.rb",
     "spec/client/commit_spec.rb",
     "spec/client/job_spec.rb",
@@ -153,7 +166,9 @@ Gem::Specification.new do |s|
   s.add_dependency "gh"
   s.add_dependency "launchy",               "~> 2.1"
   s.add_dependency "pry",                   "~> 0.9"
-  s.add_dependency "typhoeus"
+  s.add_dependency "typhoeus",              "~> 0.5"
+  s.add_dependency "pusher-client",         "~> 0.3", ">= 0.3.1"
+  s.add_dependency "websocket-native",      "~> 1.0"
   s.add_development_dependency "rspec",     "~> 2.12"
   s.add_development_dependency "sinatra",   "~> 1.3"
   s.add_development_dependency "rack-test", "~> 0.6"

metadata

@@ -1,24 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Konstantin Haase
 - Henrik Hodne
 - Peter Souter
 - Max Barnash
-- Mario Visic
+- Aaron Hill
+- Justin Lambert
+- Adrien Brault
+- Laurent Petit
+- Daniel Chatfield
 - Piotr Sarnacki
 - Raphaël Pinson
-- Laurent Petit
-- Adrien Brault
-- Justin Lambert
-- Aaron Hill
+- Mario Visic
+- Benjamin Manns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -136,16 +138,50 @@ dependencies:
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: pusher-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: websocket-native
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -194,26 +230,32 @@ email:
 - me@henrikhodne.com
 - p.morsou@gmail.com
 - i.am@anhero.ru
+- aa1ronham@gmail.com
+- benmanns@gmail.com
+- adrien.brault@gmail.com
+- laurent.petit@gmail.com
+- chatfielddaniel@gmail.com
 - drogus@gmail.com
 - raphael.pinson@camptocamp.com
-- laurent.petit@gmail.com
-- adrien.brault@gmail.com
-- jlambert@eml.cc
-- aa1ronham@gmail.com
 - mario@mariovisic.com
+- jlambert@eml.cc
 executables:
 - travis
-extensions: []
+extensions:
+- completion/extconf.rb
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
 - Rakefile
 - bin/travis
+- completion/extconf.rb
+- completion/travis.sh
 - example/org_overview.rb
 - lib/travis.rb
 - lib/travis/cacert.pem
 - lib/travis/cli.rb
+- lib/travis/cli/accounts.rb
 - lib/travis/cli/api_command.rb
 - lib/travis/cli/branches.rb
 - lib/travis/cli/command.rb
@@ -242,6 +284,7 @@ files:
 - lib/travis/cli/init/scala.yml
 - lib/travis/cli/login.rb
 - lib/travis/cli/logs.rb
+- lib/travis/cli/monitor.rb
 - lib/travis/cli/open.rb
 - lib/travis/cli/parser.rb
 - lib/travis/cli/pubkey.rb
@@ -259,11 +302,13 @@ files:
 - lib/travis/client.rb
 - lib/travis/client/account.rb
 - lib/travis/client/artifact.rb
+- lib/travis/client/broadcast.rb
 - lib/travis/client/build.rb
 - lib/travis/client/commit.rb
 - lib/travis/client/entity.rb
 - lib/travis/client/error.rb
 - lib/travis/client/job.rb
+- lib/travis/client/listener.rb
 - lib/travis/client/methods.rb
 - lib/travis/client/namespace.rb
 - lib/travis/client/repository.rb
@@ -273,6 +318,7 @@ files:
 - lib/travis/client/worker.rb
 - lib/travis/pro.rb
 - lib/travis/tools/formatter.rb
+- lib/travis/tools/safe_string.rb
 - lib/travis/tools/token_finder.rb
 - lib/travis/version.rb
 - spec/cli/encrypt_spec.rb
@@ -290,6 +336,7 @@ files:
 - spec/cli/version_spec.rb
 - spec/cli/whoami_spec.rb
 - spec/client/account_spec.rb
+- spec/client/broadcast_spec.rb
 - spec/client/build_spec.rb
 - spec/client/commit_spec.rb
 - spec/client/job_spec.rb