circler 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04a84c2140e10bf2aa03f7d965432158ef882c8b
-  data.tar.gz: 108e7f83fc13da7fec212cfa1870d88b0e86e7ac
+  metadata.gz: 7a0bff5698706e6bf37040feab3422d9cf523cb6
+  data.tar.gz: 21df7ada83e50eab7532a1b4a7b632615ef253a0
 SHA512:
-  metadata.gz: 202f45afbaba993cd9d2bc8417ad8cedf7dc5c5476c0edbd9e38802d16463987b7a2386e4aadfcb70586565d449c7a3d6bd0462e5aff431c9ac9c9b8789ea97c
-  data.tar.gz: 0ae2698e134b57bdf11b5f7f25be10b5546ca6ae969d7e3d7a4515c41db2f8449a0719364ecd94ad324670119127ca75fdcb31f3aedba875d20b2721d72e2c1a
+  metadata.gz: a1d436af72afa90fdf030ac44bf3680c2087180ecb538ac4567b48b82c9dde1a69aa6804740bc6a844459a0f55931926eb86816dda9574c145f80b85e82de1e1
+  data.tar.gz: d5763b8b7ebed54276d14d60448b010be05afe27b1d2eab6297778013aeb9925fe83d3c7aa89edd80164ab80753fd1379a2dc2fab258ef40682a24667687bd51

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    circler (0.2.1)
+    circler (0.3.0)
       circleci (~> 0.2.0)
       colorize (~> 0.7.7)
       faraday (~> 0.9.2)
       highline (~> 1.7.8)
       launchy (~> 2.4.3)
+      pusher-client (~> 0.6.2)
       rugged (~> 0.24.0b11)
       terminal-table (~> 1.5.2)
       thor (~> 0.19.1)
@@ -15,22 +16,26 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    circleci (0.2.1)
+    circleci (0.2.2)
       rest-client (~> 1.8)
     colorize (0.7.7)
     diff-lcs (1.2.5)
-    domain_name (0.5.20160128)
+    domain_name (0.5.20160216)
       unf (>= 0.0.5, < 1.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     highline (1.7.8)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
+    json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)
     mime-types (2.99.1)
     multipart-post (2.0.0)
     netrc (0.11.0)
+    pusher-client (0.6.2)
+      json
+      websocket (~> 1.0)
     rake (10.5.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -49,12 +54,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rugged (0.24.0b13)
+    rugged (0.24.0)
     terminal-table (1.5.2)
     thor (0.19.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
+    websocket (1.2.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,6 +1,6 @@
 # Circler
 
-[![Circle CI](https://circleci.com/gh/unhappychoice/circle.svg?style=svg)](https://circleci.com/gh/unhappychoice/circle)
+[![Circle CI](https://circleci.com/gh/unhappychoice/circler.svg?style=svg)](https://circleci.com/gh/unhappychoice/circler)
 
 Circler is a CLI tool for [Circle CI](https://circleci.com).
 

data/circler.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Production
+  spec.add_dependency 'pusher-client', '~> 0.6.2'
   spec.add_dependency 'thor', '~> 0.19.1'
   spec.add_dependency 'faraday', '~> 0.9.2'
   spec.add_dependency 'launchy', '~> 2.4.3'

data/lib/circler/cli.rb

@@ -12,6 +12,8 @@ require 'circler/command/projects_command'
 require 'circler/command/builds_command'
 require 'circler/command/build_command'
 require 'circler/command/browse_command'
+require 'circler/command/watch_command'
+require 'circler/response/account'
 require 'circler/response/project'
 require 'circler/response/build'
 require 'circler/response/step'
@@ -19,6 +21,7 @@ require 'circler/response/action'
 require 'circler/printer/project_printer'
 require 'circler/printer/build_printer'
 require 'circler/printer/step_printer'
+require 'circler/networking/pusher_client'
 
 module Circler
   class CLI < Thor
@@ -48,6 +51,13 @@ module Circler
       BrowseCommand.run(options)
     end
 
+    desc 'watch', 'watch a build in real time'
+    method_option :project, aliases: 'p', type: :string, banner: 'user/project'
+    method_option :build, aliases: 'n', type: :numeric, banner: 'build-number'
+    def watch
+      WatchCommand.run(options)
+    end
+
     desc 'version', 'show gem version'
     def version
       say Circler::VERSION

data/lib/circler/command/browse_command.rb

@@ -2,6 +2,7 @@ module Circler
   class BrowseCommand < BaseCommand
     class << self
       def run(options)
+        setup_token
         project = project_name(options)
         number = options.build
         Launchy.open url(project, number)

data/lib/circler/command/watch_command.rb

@@ -0,0 +1,86 @@
+module Circler
+  class WatchCommand < BaseCommand
+    class << self
+      def run(options)
+        setup_token
+        say 'Connecting to pusher'.blue
+
+        update_builds(options)
+        setup_client(options)
+
+        say 'Connected'.blue
+
+        loop do
+          start_watch(@@builds.first) if !@@builds.empty? && !@@running
+          sleep 1
+        end
+      end
+
+      private
+
+      def setup_client(options)
+        @@running = false
+        @@client = CirclerPusherClient.new
+        @@client.connect
+        @@client.bind("private-#{Account.me.user_name}", 'call') do
+          @@running = false
+          update_builds(options)
+        end
+      end
+
+      def update_builds(options)
+        username, reponame = project_name(options).split('/')
+        @@builds = Build
+          .all(username, reponame)
+          .select { |b| b.status == 'running' }
+      end
+
+      def start_watch(build)
+        @@running = true
+        print_bordered "Start watching #{build.username}/#{build.reponame} build ##{build.build_number}".blue
+
+        bind_event_handling(build.channel_name)
+        wait_until_finish
+        finalize(build, build.channel_name)
+      end
+
+      def bind_event_handling(channel)
+        @@client.bind(channel, 'newAction') do |data|
+          JSON.parse(data).each do |d|
+            print_bordered d['log']['name'].green
+          end
+        end
+
+        @@client.bind(channel, 'appendAction') do |data|
+          JSON.parse(data).each { |d| say d['out']['message'] }
+        end
+
+        @@client.bind(channel, 'updateAction') do |data|
+          JSON.parse(data).each do |d|
+            @@running = d['log']['name'] != 'Disable SSH'
+          end
+        end
+      end
+
+      def wait_until_finish
+        while @@running
+          sleep(1)
+        end
+      end
+
+      def finalize(build, channel)
+        @@builds = @@builds.select { |b| b.build_number != build.build_number }
+        @@client.unsubscribe(channel)
+
+        print_bordered "Finish watching #{build.username}/#{build.reponame} build ##{build.build_number}".blue
+      end
+
+      def print_bordered(text)
+        say Terminal::Table.new(
+          rows: [[text]],
+          style: { width: 120 }
+        ).to_s
+      end
+    end
+  end
+end

data/lib/circler/networking/pusher_client.rb

@@ -0,0 +1,48 @@
+require 'pusher-client'
+
+class CirclerPusherClient
+  def connect
+    PusherClient.logger.level = Logger::ERROR
+    @socket = PusherClient::Socket.new(app_key, pusher_options)
+    @socket.connect(true)
+  end
+
+  def bind(channel, event)
+    @socket.subscribe(channel)
+    @socket[channel].bind(event) do |data|
+      yield data
+    end
+  end
+
+  def unsubscribe(channel)
+    @socket.unsubscribe(channel)
+  end
+
+  private
+
+  def app_key
+    '1cf6e0e755e419d2ac9a'
+  end
+
+  def pusher_options
+    {
+      secure: true,
+      auth_method: Proc.new { |a, b| auth(a, b) },
+      logger: Logger.new('/dev/null')
+    }
+  end
+
+  def auth(socket_id, channel)
+    data = { socket_id: socket_id, channel_name: channel.name }
+    token = ENV['CIRCLE_CI_TOKEN'] || ask('Circle CI token ? :')
+    res = connection.post("/auth/pusher?circle-token=#{token}", data)
+    JSON.parse(res.body)['auth']
+  end
+
+  def connection
+    Faraday.new(url: 'https://circleci.com') do |f|
+      f.request :url_encoded
+      f.adapter Faraday.default_adapter
+    end
+  end
+end

data/lib/circler/response/account.rb

@@ -0,0 +1,15 @@
+module Circler
+  class Account
+    def initialize(hash)
+      @hash = hash
+    end
+
+    def user_name
+      @hash['name']
+    end
+
+    def self.me
+      Account.new(CircleCi::User.me.body)
+    end
+  end
+end

data/lib/circler/response/action.rb

@@ -1,4 +1,3 @@
-require 'pp'
 module Circler
   class Action
     attr_reader :name, :status, :run_time_millis

data/lib/circler/response/build.rb

@@ -30,6 +30,18 @@ module Circler
       @hash['reponame']
     end
 
+    def status
+      @hash['status']
+    end
+
+    def build_number
+      @hash['build_num']
+    end
+
+    def channel_name
+      "private-#{username}@#{reponame}@#{build_number}@vcs-github"
+    end
+
     def information
       [
         @hash['build_num'],

data/lib/circler/version.rb

@@ -1,3 +1,3 @@
 module Circler
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: circler
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - unhappychoice
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pusher-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -190,9 +204,12 @@ files:
 - lib/circler/command/build_command.rb
 - lib/circler/command/builds_command.rb
 - lib/circler/command/projects_command.rb
+- lib/circler/command/watch_command.rb
+- lib/circler/networking/pusher_client.rb
 - lib/circler/printer/build_printer.rb
 - lib/circler/printer/project_printer.rb
 - lib/circler/printer/step_printer.rb
+- lib/circler/response/account.rb
 - lib/circler/response/action.rb
 - lib/circler/response/build.rb
 - lib/circler/response/project.rb