travis 1.5.7.travis.345.4 → 1.5.7

data/lib/travis/cli/init.rb

@@ -34,8 +34,7 @@ module Travis
       attr_writer :travis_config
 
       def self.languages
-        pattern = File.expand_path("../init/*.yml", __FILE__)
-        Dir[pattern].map { |f| File.basename(f, '.yml') }.sort
+        Dir[asset_path('init/*.yml')].map { |f| File.basename(f, '.yml') }.sort
       end
 
       def help
@@ -64,7 +63,7 @@ module Travis
       private
 
         def template_name(language)
-          File.expand_path("../init/#{language}.yml", __FILE__)
+          asset_path "init/#{language}.yml"
         end
 
         def template(language)

data/lib/travis/cli/monitor.rb

@@ -16,6 +16,10 @@ module Travis
         c.setup_notification(type)
       end
 
+      on('-b', '--builds', 'only monitor builds, not jobs')
+      on('-p', '--push', 'monitor push events')
+      on('-P', '--pull', 'monitor pull request events')
+
       attr_reader :repos, :notification
 
       def initialize(*)
@@ -53,18 +57,34 @@ module Travis
         end
       end
 
+      def events
+        events = %w[build:started build:finished]
+        events << 'job:started' << 'job:finished' unless builds?
+        events
+      end
+
+      def all?
+        !pull? and !push?
+      end
+
+      def monitor?(entity)
+        return true if all?
+        entity.pull_request? ? pull? : push?
+      end
+
       def run
         listen(*repos) do |listener|
-          listener.on_connect { say description, 'Monitoring %s:' }
-          listener.on 'build:started', 'job:started', 'build:finished', 'job:finished' do |event|
+          listener.on_connect { say description, "Monitoring #{"builds for " if builds?}%s:" }
+          listener.on(*events) do |event|
             entity = event.job          || event.build
             time   = entity.finished_at || entity.started_at
+            next unless monitor? entity
             say [
               color(formatter.time(time), entity.color),
               color(entity.inspect_info, [entity.color, :bold]),
               color(entity.state, entity.color)
             ].join(" ")
-            notification.notify("Travis CI", "#{entity.inspect_info} #{entity.state}")
+            notification.notify(entity.repository.slug, "#{entity.class.name[/[^:]+$/]} ##{entity.number} #{entity.state}")
           end
         end
       end

data/lib/travis/cli/repo_command.rb

@@ -6,12 +6,14 @@ module Travis
   module CLI
     class RepoCommand < ApiCommand
       GIT_REGEX = %r{/?(.*/.+?)(\.git)?$}
+      TRAVIS    = %r{^https://(staging-)?api\.travis-ci\.(org|com)}
       on('-r', '--repo SLUG', 'repository to use (will try to detect from current git clone)') { |c, slug| c.slug = slug }
 
       attr_accessor :slug
       abstract
 
       def setup
+        setup_enterprise
         error "Can't figure out GitHub repo name. Ensure you're in the repo directory, or specify the repo name via the -r option (e.g. travis <command> -r <repo-name>)" unless self.slug ||= find_slug
         error "GitHub repo name is invalid, it should be on the form 'owner/repo'" unless self.slug.include?("/")
         self.api_endpoint = detect_api_endpoint
@@ -63,10 +65,12 @@ module Travis
         end
 
         def detect_api_endpoint
-          if explicit_api_endpoint?
+          if explicit_api_endpoint? or enterprise?
             repo_config['endpoint'] = api_endpoint
           elsif ENV['TRAVIS_ENDPOINT']
             ENV['TRAVIS_ENDPOINT']
+          elsif config['default_endpoint'] and config['default_endpoint'] !~ TRAVIS
+            repo_config['endpoint'] ||= config['default_endpoint']
           else
             repo_config['endpoint'] ||= begin
               load_gh

data/lib/travis/client/listener.rb

@@ -70,7 +70,7 @@ module Travis
 
       def initialize(session)
         @session   = session
-        @socket    = Socket.new(pusher_key, :encrypted => true, :session => session)
+        @socket    = Socket.new(pusher_key, pusher_options)
         @channels  = []
         @callbacks = []
       end
@@ -139,6 +139,19 @@ module Travis
           session.user.channels
         end
 
+        def pusher_options
+          pusher_options       = session.config['pusher'] || {}
+          encrypted            = pusher_options['scheme'] != 'http'
+          options              = { :encrypted => encrypted, :session => session }
+          options[:ws_host]    = pusher_options['host'] if pusher_options['host']
+          options[:wss_port]   = pusher_options['port'] if encrypted  and pusher_options['port']
+          options[:ws_port]    = pusher_options['port'] if !encrypted and pusher_options['port']
+          options[:ws_path]    = pusher_options['path'] if pusher_options['path']
+          options[:ws_path]    = '/' << options[:ws_path] unless options[:ws_path].nil? or options[:ws_path].start_with? '/'
+          options[:ssl_verify] = session.ssl.fetch(:verify, true)
+          options
+        end
+
         def pusher_key
           session.config.fetch('pusher').fetch('key')
         rescue IndexError

data/lib/travis/client/session.rb

@@ -4,6 +4,7 @@ require 'travis/version'
 require 'faraday'
 require 'faraday_middleware'
 require 'travis/tools/system'
+require 'travis/tools/assets'
 
 begin
   require 'typhoeus/adapters/faraday' unless Travis::Tools::System.windows?
@@ -15,7 +16,8 @@ require 'json'
 module Travis
   module Client
     class Session
-      SSL_OPTIONS = { :ca_file => File.expand_path("../../cacert.pem", __FILE__) }
+      SSL_OPTIONS = { :ca_file => Tools::Assets['cacert.pem'] }
+
       include Methods
       attr_reader :connection, :headers, :access_token, :instruments, :faraday_adapter, :agent_info, :ssl
 

data/lib/travis/tools/assets.rb

@@ -0,0 +1,21 @@
+module Travis
+  module Tools
+    module Assets
+      BASE = File.expand_path('../../../../assets', __FILE__)
+      extend self
+
+      def asset_path(file)
+        File.expand_path(file, BASE)
+      end
+
+      def asset(file)
+        File.read(asset_path(file))
+      end
+
+      class << self
+        alias [] asset_path
+        alias read asset
+      end
+    end
+  end
+end

data/lib/travis/tools/completion.rb

@@ -0,0 +1,50 @@
+require 'travis/tools/assets'
+require 'travis/cli'
+require 'fileutils'
+require 'erb'
+
+module Travis
+  module Tools
+    module Completion
+      RCS = ['.zshrc', '.bashrc'].map { |f| File.expand_path(f, ENV['HOME']) }
+      include FileUtils
+      extend self
+
+      def config_path
+        ENV.fetch('TRAVIS_CONFIG_PATH') { File.expand_path('.travis', ENV['HOME']) }
+      end
+
+      def cmp_file
+        File.expand_path('travis.sh', config_path)
+      end
+
+      def install_completion
+        mkdir_p(config_path)
+        cp(Assets['travis.sh'], cmp_file)
+        source = "source " << cmp_file
+
+        RCS.each do |file|
+          next unless File.exist? file and File.writable? file
+          next if File.read(file).include? source
+          File.open(file, "a") { |f| f.puts("", "# added by travis gem", "[ -f #{CMP_FILE} ] && #{source}") }
+        end
+      end
+
+      def completion_installed?
+        source = "source " << config_path
+        RCS.each do |file|
+          next unless File.exist? file and File.writable? file
+          return false unless File.read(file).include? source
+        end
+        true
+      end
+
+      def compile
+        commands = Travis::CLI.commands.sort_by { |c| c.command_name }
+        template = Assets.read('travis.sh.erb')
+        source   = ERB.new(template).result(binding).gsub(/^ +\n/, '')
+        File.write(Assets['travis.sh'], source)
+      end
+    end
+  end
+end

data/lib/travis/tools/notification.rb

@@ -1,5 +1,6 @@
+require "travis"
 require "travis/tools/system"
-require "terminal-notifier"
+require "travis/tools/assets"
 require "cgi"
 
 module Travis
@@ -7,6 +8,7 @@ module Travis
     module Notification
       extend self
       DEFAULT = [:osx, :growl, :libnotify]
+      ICON    = Assets['notifications/icon.png']
 
       def new(*list)
         list.concat(DEFAULT) if list.empty?
@@ -22,6 +24,7 @@ module Travis
       end
 
       class Dummy
+        BIN_PATH = Assets['Travis CI.app/Contents/MacOS/Travis CI']
         def notify(title, body)
         end
 
@@ -31,12 +34,14 @@ module Travis
       end
 
       class OSX
+        BIN_PATH = Assets["notifications/Travis CI.app/Contents/MacOS/Travis CI"]
+
         def notify(title, body)
-          TerminalNotifier.notify(body, :title => title)
+          system BIN_PATH, '-message', body.to_s, '-title', title.to_s
         end
 
         def available?
-          System.mac? and TerminalNotifier.available?
+          System.mac? and `sw_vers -productVersion`.strip >= '10.8'
         end
       end
 
@@ -46,7 +51,7 @@ module Travis
         end
 
         def notify(title, body)
-          system @command, '-n', 'Travis', '-m', body, title
+          system @command, '-n', 'Travis', '--image', ICON, '-m', body, title
         end
 
         def available?
@@ -61,7 +66,7 @@ module Travis
         end
 
         def notify(title, body)
-          system @command, "--expire-time=#{@expire_time}", title, CGI.escapeHTML(body)
+          system @command, "--expire-time=#{@expire_time}", "-i", ICON, title, CGI.escapeHTML(body)
         end
       end
     end

data/lib/travis/version.rb

@@ -1,3 +1,3 @@
 module Travis
-  VERSION = '1.5.6'
+  VERSION = '1.5.7'
 end

data/spec/support/helpers.rb

@@ -21,7 +21,7 @@ module Helpers
 
   def run_cli(*args)
     args << ENV['TRAVIS_OPTS'] if ENV['TRAVIS_OPTS']
-    args << '--skip-version-check'
+    args << '--skip-version-check' << '--skip-completion-check'
     capture do
       yield $stdin if block_given?
       $stdin.rewind

data/travis.gemspec

@@ -2,13 +2,12 @@
 Gem::Specification.new do |s|
   # general infos
   s.name        = "travis"
-  s.version     = "1.5.6"
+  s.version     = "1.5.7"
   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 = [
@@ -66,13 +65,35 @@ Gem::Specification.new do |s|
     "LICENSE",
     "README.md",
     "Rakefile",
+    "assets/cacert.pem",
+    "assets/init/c.yml",
+    "assets/init/clojure.yml",
+    "assets/init/cpp.yml",
+    "assets/init/erlang.yml",
+    "assets/init/go.yml",
+    "assets/init/groovy.yml",
+    "assets/init/haskell.yml",
+    "assets/init/java.yml",
+    "assets/init/node_js.yml",
+    "assets/init/objective-c.yml",
+    "assets/init/perl.yml",
+    "assets/init/php.yml",
+    "assets/init/python.yml",
+    "assets/init/ruby.yml",
+    "assets/init/scala.yml",
+    "assets/notifications/Travis CI.app/Contents/Info.plist",
+    "assets/notifications/Travis CI.app/Contents/MacOS/Travis CI",
+    "assets/notifications/Travis CI.app/Contents/PkgInfo",
+    "assets/notifications/Travis CI.app/Contents/Resources/Travis CI.icns",
+    "assets/notifications/Travis CI.app/Contents/Resources/en.lproj/Credits.rtf",
+    "assets/notifications/Travis CI.app/Contents/Resources/en.lproj/InfoPlist.strings",
+    "assets/notifications/Travis CI.app/Contents/Resources/en.lproj/MainMenu.nib",
+    "assets/notifications/icon.png",
+    "assets/travis.sh",
+    "assets/travis.sh.erb",
     "bin/travis",
-    "completion/extconf.rb",
-    "completion/travis.sh",
-    "completion/travis.sh.erb",
     "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",
@@ -87,21 +108,6 @@ Gem::Specification.new do |s|
     "lib/travis/cli/help.rb",
     "lib/travis/cli/history.rb",
     "lib/travis/cli/init.rb",
-    "lib/travis/cli/init/c.yml",
-    "lib/travis/cli/init/clojure.yml",
-    "lib/travis/cli/init/cpp.yml",
-    "lib/travis/cli/init/erlang.yml",
-    "lib/travis/cli/init/go.yml",
-    "lib/travis/cli/init/groovy.yml",
-    "lib/travis/cli/init/haskell.yml",
-    "lib/travis/cli/init/java.yml",
-    "lib/travis/cli/init/node_js.yml",
-    "lib/travis/cli/init/objective-c.yml",
-    "lib/travis/cli/init/perl.yml",
-    "lib/travis/cli/init/php.yml",
-    "lib/travis/cli/init/python.yml",
-    "lib/travis/cli/init/ruby.yml",
-    "lib/travis/cli/init/scala.yml",
     "lib/travis/cli/login.rb",
     "lib/travis/cli/logout.rb",
     "lib/travis/cli/logs.rb",
@@ -152,6 +158,8 @@ Gem::Specification.new do |s|
     "lib/travis/client/user.rb",
     "lib/travis/client/worker.rb",
     "lib/travis/pro.rb",
+    "lib/travis/tools/assets.rb",
+    "lib/travis/tools/completion.rb",
     "lib/travis/tools/formatter.rb",
     "lib/travis/tools/notification.rb",
     "lib/travis/tools/safe_string.rb",
@@ -205,8 +213,7 @@ Gem::Specification.new do |s|
   s.add_dependency "launchy",               "~> 2.1"
   s.add_dependency "pry",                   "~> 0.9"
   s.add_dependency "typhoeus",              "~> 0.6"
-  s.add_dependency "pusher-client",         "~> 0.3", ">= 0.3.1"
-  s.add_dependency "terminal-notifier",     ">= 1.4.2"
+  s.add_dependency "pusher-client",         "~> 0.4"
   s.add_dependency "addressable",           "~> 2.3"
   s.add_development_dependency "rspec",     "~> 2.12"
   s.add_development_dependency "sinatra",   "~> 1.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.5.7.travis.345.4
+  version: 1.5.7
 platform: ruby
 authors:
 - Konstantin Haase
@@ -90,14 +90,14 @@ dependencies:
   name: backports
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -162,34 +162,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -272,20 +252,41 @@ email:
 - adrien.brault@gmail.com
 executables:
 - travis
-extensions:
-- completion/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
 - Rakefile
+- assets/cacert.pem
+- assets/init/c.yml
+- assets/init/clojure.yml
+- assets/init/cpp.yml
+- assets/init/erlang.yml
+- assets/init/go.yml
+- assets/init/groovy.yml
+- assets/init/haskell.yml
+- assets/init/java.yml
+- assets/init/node_js.yml
+- assets/init/objective-c.yml
+- assets/init/perl.yml
+- assets/init/php.yml
+- assets/init/python.yml
+- assets/init/ruby.yml
+- assets/init/scala.yml
+- assets/notifications/Travis CI.app/Contents/Info.plist
+- assets/notifications/Travis CI.app/Contents/MacOS/Travis CI
+- assets/notifications/Travis CI.app/Contents/PkgInfo
+- assets/notifications/Travis CI.app/Contents/Resources/Travis CI.icns
+- assets/notifications/Travis CI.app/Contents/Resources/en.lproj/Credits.rtf
+- assets/notifications/Travis CI.app/Contents/Resources/en.lproj/InfoPlist.strings
+- assets/notifications/Travis CI.app/Contents/Resources/en.lproj/MainMenu.nib
+- assets/notifications/icon.png
+- assets/travis.sh
+- assets/travis.sh.erb
 - bin/travis
-- completion/extconf.rb
-- completion/travis.sh
-- completion/travis.sh.erb
 - 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
@@ -300,21 +301,6 @@ files:
 - lib/travis/cli/help.rb
 - lib/travis/cli/history.rb
 - lib/travis/cli/init.rb
-- lib/travis/cli/init/c.yml
-- lib/travis/cli/init/clojure.yml
-- lib/travis/cli/init/cpp.yml
-- lib/travis/cli/init/erlang.yml
-- lib/travis/cli/init/go.yml
-- lib/travis/cli/init/groovy.yml
-- lib/travis/cli/init/haskell.yml
-- lib/travis/cli/init/java.yml
-- lib/travis/cli/init/node_js.yml
-- lib/travis/cli/init/objective-c.yml
-- lib/travis/cli/init/perl.yml
-- lib/travis/cli/init/php.yml
-- lib/travis/cli/init/python.yml
-- lib/travis/cli/init/ruby.yml
-- lib/travis/cli/init/scala.yml
 - lib/travis/cli/login.rb
 - lib/travis/cli/logout.rb
 - lib/travis/cli/logs.rb
@@ -365,6 +351,8 @@ files:
 - lib/travis/client/user.rb
 - lib/travis/client/worker.rb
 - lib/travis/pro.rb
+- lib/travis/tools/assets.rb
+- lib/travis/tools/completion.rb
 - lib/travis/tools/formatter.rb
 - lib/travis/tools/notification.rb
 - lib/travis/tools/safe_string.rb
@@ -416,18 +404,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Travis CI client
 test_files: []
+has_rdoc: