circler 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a5dd67dd34e6e39fcb1874a7f4ae9ed08b379e9
-  data.tar.gz: f4f9cbc531ae9a6b841fb881535850f33ace222d
+  metadata.gz: 5961bad07a4cc984a8a3e1ee1add550212da1f90
+  data.tar.gz: c09434edbac2080beb6dcde0392bc00c2047ee7e
 SHA512:
-  metadata.gz: bd6a8a61803c7d20b87d9ab8440ea323bb884267c34299b9abf172f8ee65ce4ac29b47fd969b2f8ab5ff96494e6391b4d3a28e674af1effd228fffbf93adf18d
-  data.tar.gz: eeb74441ac6e45652d2d46ede335e2d5208267b7cb31e8ff6e6194fb1b7dbf0a67a2a782ca5e1332af1c5022ec2f8794cc2c2e9241d909fa529f217a85670fb9
+  metadata.gz: 0d85d4550bbf333cb53889c3f8c9cfb58f4f0a4ef2bc3e7191be99ec708f83bbfca66050a082b671776bf92a6dc78f263c87bb42d729361c7cc181914ea1a885
+  data.tar.gz: 21ceea61473f81b51694d0ecea126ceb74e4ade95f333bde2bcb88b7fb9754fc973ca4386d0ce787579756c2b84b0b63cca241e927b8adbe61dcf87bbe1fca7e

data/Gemfile.lock

@@ -1,76 +1,66 @@
 PATH
   remote: .
   specs:
-    circler (0.4.0)
-      circleci (~> 0.2.0)
-      colorize (~> 0.7.7)
-      faraday (~> 0.9.2)
+    circler (0.4.1)
+      circleci (~> 1.0.3)
+      colorize (~> 0.8.1)
+      faraday (~> 0.11.0)
       highline (~> 1.7.8)
       launchy (~> 2.4.3)
       pusher-client (~> 0.6.2)
-      rugged (~> 0.24.0b11)
-      terminal-notifier (~> 1.6.3)
-      terminal-table (~> 1.5.2)
-      thor (~> 0.19.1)
+      rugged (~> 0.25.1.1)
+      terminal-notifier (~> 1.7.1)
+      terminal-table (~> 1.7.3)
+      thor (~> 0.19.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
-    circleci (0.2.2)
-      rest-client (~> 1.8)
-    colorize (0.7.7)
-    diff-lcs (1.2.5)
-    domain_name (0.5.20160309)
-      unf (>= 0.0.5, < 1.0.0)
-    faraday (0.9.2)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    circleci (1.0.3)
+    colorize (0.8.1)
+    diff-lcs (1.3)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
     highline (1.7.8)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    json (1.8.3)
+    json (2.0.3)
     launchy (2.4.3)
       addressable (~> 2.3)
-    mime-types (2.99.1)
     multipart-post (2.0.0)
-    netrc (0.11.0)
+    public_suffix (2.0.5)
     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)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.3)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rake (12.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rugged (0.24.0)
-    terminal-notifier (1.6.3)
-    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)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rugged (0.25.1.1)
+    terminal-notifier (1.7.1)
+    terminal-table (1.7.3)
+      unicode-display_width (~> 1.1.1)
+    thor (0.19.4)
+    unicode-display_width (1.1.3)
+    websocket (1.2.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.9)
+  bundler
   circler!
-  rake (~> 10.0)
+  rake
   rspec
 
 BUNDLED WITH

data/README.md

@@ -1,6 +1,9 @@
 # Circler
 
-[![Circle CI](https://circleci.com/gh/unhappychoice/Circler.svg?style=svg)](https://circleci.com/gh/unhappychoice/Circler)
+[![Gem Version](https://badge.fury.io/rb/circler.svg)](https://badge.fury.io/rb/circler)
+[![Circle CI](https://circleci.com/gh/unhappychoice/Circler.svg?style=shield)](https://circleci.com/gh/unhappychoice/Circler)
+[![Code Climate](https://codeclimate.com/github/unhappychoice/Circler/badges/gpa.svg)](https://codeclimate.com/github/unhappychoice/Circler)
+[![Dependency Status](https://gemnasium.com/badges/github.com/unhappychoice/Circler.svg)](https://gemnasium.com/github.com/unhappychoice/Circler)
 
 Circler is a CLI tool for [Circle CI](https://circleci.com).
 
@@ -19,59 +22,21 @@ export CIRCLE_CI_TOKEN=your-circle-ci-token
 ```
 
 ## Usage
-
-#### watch
-watch build in real time
-
-```sh
-$ circle watch
-
-# Options:
-# p, [--project=user/project]
-```
-
-#### projects
-
-list all the projects you can see.
-
-```sh
-$ circle projects
-```
-
-#### builds
-
-list specific projects' builds.
-
-```sh
-$ circle builds
-
-# Options:
-# p, [--project=user/project]
-# b, [--branch=some-branch]
 ```
-
-#### build
-
-show specific build description.
-
-```sh
-$ circle build
-
-# Options:
-# p, [--project=user/project]
-# n, [--build=build-number]
-```
-
-#### browse
-
-open Circle CI website
-
-```sh
-$ circle browse
-
-# Options:
-# p, [--project=user/project]
-# n, [--build=build-number]
+Commands:
+  circle browse          # open circle ci website
+  circle build           # show build description
+  circle builds          # list builds
+  circle help [COMMAND]  # Describe available commands or one specific command
+  circle projects        # list projects
+  circle retry           # show build description
+  circle version         # show gem version
+  circle watch           # watch a build in real time
+
+Options:
+  -p user_name/project   # specify repository
+  -b branch              # specify branch name
+  -n build_number        # specify build number
 ```
 
 ## Contributing

data/circler.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["unhappychoice"]
   spec.email         = ["unhappychoice@gmail.com"]
 
-  spec.summary       = %q{CLI tool for Circle CI}
-  spec.description   = %q{A command line tool for circle ci}
+  spec.summary       = %q{CLI tool for CircleCI}
+  spec.description   = %q{A command line tool for CircleCI}
   spec.homepage      = "https://github.com/unhappychoice/circler"
   spec.license       = "MIT"
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -20,18 +20,18 @@ Gem::Specification.new do |spec|
 
   # 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 'thor', '~> 0.19.4'
+  spec.add_dependency 'faraday', '~> 0.11.0'
   spec.add_dependency 'launchy', '~> 2.4.3'
-  spec.add_dependency 'circleci', '~> 0.2.0'
-  spec.add_dependency 'rugged', '~> 0.24.0b11'
-  spec.add_dependency 'terminal-table', '~> 1.5.2'
+  spec.add_dependency 'circleci', '~> 1.0.3'
+  spec.add_dependency 'rugged', '~> 0.25.1.1'
+  spec.add_dependency 'terminal-table', '~> 1.7.3'
   spec.add_dependency 'highline', '~> 1.7.8'
-  spec.add_dependency 'colorize', '~> 0.7.7'
-  spec.add_dependency 'terminal-notifier', '~> 1.6.3'
+  spec.add_dependency 'colorize', '~> 0.8.1'
+  spec.add_dependency 'terminal-notifier', '~> 1.7.1'
 
   # Development
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/lib/circler/command/base_command.rb

@@ -24,6 +24,10 @@ module Circler
         return $1 if origin.url =~ %r{git@github.com:([\w_-]+/[\w_-]+)\.git}
         nil
       end
+
+      def build_number(options)
+        options.build || ask('Input build number')
+      end
     end
   end
 end

data/lib/circler/command/build_command.rb

@@ -4,7 +4,7 @@ module Circler
       def run(options)
         setup_token
         username, reponame = project_name(options).split('/')
-        number = options.build || ask('Input build number')
+        number = build_number(options)
         build = Build.get(username, reponame, number)
         say StepPrinter.new(build.steps)
       end

data/lib/circler/command/retry_command.rb

@@ -4,7 +4,7 @@ module Circler
       def run(options)
         setup_token
         username, reponame = project_name(options).split('/')
-        number = options.build || ask('Input build number')
+        number = build_number(options)
         build = Build.retry(username, reponame, number)
         if build.username
           say "build #{build.username}/#{build.reponame} #{build.build_number} is triggered."

data/lib/circler/command/watch_command.rb

@@ -3,36 +3,33 @@ module Circler
     class << self
       def run(options)
         setup_token
-        say 'Connecting to pusher'.blue
 
-        update_builds(options)
-        setup_client(options)
+        build = get_build(options)
 
-        say 'Connected'.blue
+        if !build.nil? && build.running?
+          say 'Connecting to pusher'.blue
+          setup_client
+          say 'Connected'.blue
 
-        loop do
-          start_watch(@@builds.first) if !@@builds.empty? && !@@running
-          sleep 1
+          start_watch(build)
+          wait_until_finish
+          finalize(build, build.channel_name)
+        else
+          say 'The build is not running'
         end
       end
 
       private
 
-      def setup_client(options)
-        @@running = false
+      def setup_client()
         @@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)
+      def get_build(options)
         username, reponame = project_name(options).split('/')
-        @@builds = Build
-          .all(username, reponame)
-          .select { |b| b.status == 'running' }
+        number = build_number(options)
+        Build.get(username, reponame, number)
       end
 
       def start_watch(build)
@@ -40,9 +37,7 @@ module Circler
         print_bordered "Start watching #{build.username}/#{build.reponame} build ##{build.build_number}".blue
         TerminalNotifier.notify("Start to build #{build.username}/#{build.reponame} build ##{build.build_number}")
 
-        bind_event_handling(build.channel_name + '@0')
-        wait_until_finish
-        finalize(build, build.channel_name + '@0')
+        bind_event_handling(build.channel_name)
       end
 
       def bind_event_handling(channel)
@@ -70,7 +65,6 @@ module Circler
       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

data/lib/circler/response/build.rb

@@ -1,4 +1,3 @@
-require 'pp'
 module Circler
   class Build
     class << self
@@ -43,8 +42,12 @@ module Circler
       @hash['build_num']
     end
 
+    def running?
+      status == 'running'
+    end
+
     def channel_name
-      "private-#{username}@#{reponame}@#{build_number}@vcs-github"
+      "private-#{username}@#{reponame}@#{build_number}@vcs-github@0"
     end
 
     def information

data/lib/circler/version.rb

@@ -1,3 +1,3 @@
 module Circler
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circler
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - unhappychoice
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.4
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0b11
+        version: 0.25.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0b11
+        version: 0.25.1.1
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -128,56 +128,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: terminal-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A command line tool for circle ci
+description: A command line tool for CircleCI
 email:
 - unhappychoice@gmail.com
 executables:
@@ -254,5 +254,5 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: CLI tool for Circle CI
+summary: CLI tool for CircleCI
 test_files: []