circle-cli 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84f8d9396d38131c1ac6a9a5fce0817658d5a8c3
-  data.tar.gz: d6202342ace41bb63992d03b37d6d6a1f0ff0d17
+  metadata.gz: 8ec32b3c7353d7ccd09c6f94ff30f62860a529b2
+  data.tar.gz: 9bd7e701530d2cc98374ed6af4d918a0d7edf85f
 SHA512:
-  metadata.gz: 2ce5fbfea58c54cc30105a1e07bf42a3cfa722d60789f89f7624631e3a606d380d57a9f0018efdf862cc79b74355127c33aaf521a04d9b55a3964981f63c564d
-  data.tar.gz: 453f17a3fafb3c96eaa477f0cb8cd6a0ae935331fa100d408f33cd6dcc421d157daf794a17f823fd32d93ae818a6407ef6b5bdda2c88d661278c93d5b8e0ecc9
+  metadata.gz: c2e59afcad27182a8db025642bccb4781ae31099983f6ff4c7db216383c3b902463c1a101eb88fcd7a787bd6ae679534af30d0736ec005354a898b5036c617ae
+  data.tar.gz: 8575aeb713849ecb4c4692c14935d3efc02801918911f4f7c5cb0e0de04e1213b091553e8298d6ed8c468109fac5472d4a92e2ab47f37d16194631a888ac5690

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Jean Boussier
+Copyright (c) 2014-2016 Derek Keith, Jean Boussier
 
 MIT License
 

data/README.md

@@ -1,7 +1,14 @@
 # Circle CLI
-
 Command line tools for Circle CI
 
+[![Gem Version](https://badge.fury.io/rb/circle-cli.svg)](https://badge.fury.io/rb/circle-cli)
+[![CircleCI Status](https://circleci.com/gh/circle-cli/circle-cli.svg?style=shield&circle-token=e24d4c43a7437111a6ee5915901017a8419ddbf4)](https://circleci.com/gh/circle-cli/circle-cli)
+[![Dependency Status](https://gemnasium.com/codeurge/circle-cli.svg)](https://gemnasium.com/codeurge/circle-cli)
+[![Code Climate](https://codeclimate.com/github/codeurge/circle-cli/badges/gpa.svg)](https://codeclimate.com/github/codeurge/circle-cli)
+[![Test Coverage](https://codeclimate.com/github/codeurge/circle-cli/badges/coverage.svg)](https://codeclimate.com/github/codeurge/circle-cli/coverage)
+
+![circle-cli demo](https://cloud.githubusercontent.com/assets/306238/13765850/b410ea98-ea22-11e5-8cb9-4942d6071654.gif)
+
 ## Installation
 
     $ gem install circle-cli
@@ -14,36 +21,54 @@ Command line tools for Circle CI
   $ gem install circle-cli
   ```
 
-2. Add your GitHub token
+2. Add your CircleCI token
 
   ```
-  $ circle github-token <github-token>
+  $ circle token <your token>
   ```
 
-3. Add your CircleCI token
+## Usage
+
+- Get the CI status for the HEAD of your current branch
 
   ```
-  $ circle token <circle-ci-token>
+  $ circle
   ```
-  
-## Usage
 
-- Get the CI status for the HEAD of your current branch
+- Start a new CI build for the HEAD of your current branch
 
   ```
-  $ circle status
+  $ circle build
+  ```
+
+- Watch the most recent CI build for your current branch
+
   ```
-  
+  $ circle watch
+  ```
+
+- Cancel the most recent CI build for your current branch
+
+  ```
+  $ circle cancel
+  ```
+
 - Open the results page for the latest CI run
 
   ```
   $ circle open
   ```
 
+- For additional help
+
+  ```
+  $ circle help
+  ```
+
 ## Contributing
 
-1. Fork it ( http://github.com/byroot/circle-cli/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
+1. Fork it ( http://github.com/codeurge/circle-cli/fork )
+2. Create your feature branch with your initials (`git checkout -b dsk/my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request

data/bin/circle

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
 
-lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require 'optparse'
 require 'circle-cli'
-
 Circle::CLI.run(ARGV)

data/circle-cli.gemspec

@@ -6,8 +6,8 @@ require 'circle/cli/version'
 Gem::Specification.new do |spec|
   spec.name          = 'circle-cli'
   spec.version       = Circle::CLI::VERSION
-  spec.authors       = ['Jean Boussier']
-  spec.email         = ['jean.boussier@gmail.com']
+  spec.authors       = ['Derek Keith', 'Jean Boussier']
+  spec.email         = ['derek@codeurge.com', 'jean.boussier@gmail.com']
   spec.summary       = %q{Command line tools for Circle CI}
   spec.description   = %q{A bunch of commands useful to deal with Circle CI without leaving your terminal.}
   spec.homepage      = ''
@@ -20,9 +20,14 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'circleci'
   spec.add_dependency 'rugged', '>= 0.23'
-  spec.add_dependency 'octokit'
+  spec.add_dependency 'gitable'
+  spec.add_dependency 'launchy'
+  spec.add_dependency 'thor'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'vcr'
+  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'simplecov'
 end

data/lib/circle/cli.rb

@@ -1,135 +1,11 @@
+require 'thor'
 require 'circle/cli/version'
-require 'uri'
-require 'rugged'
-require 'octokit'
-require 'circleci'
+require 'circle/cli/app'
 
 module Circle
-  class CLI
-
-    class << self
-
-      def run(*args)
-        new.dispatch!(*args)
-      end
-
-    end
-
-    def initialize
-      @options = {}
-      @parser ||= OptionParser.new do |opts|
-        # future options will go here
-      end
-    end
-
-    def dispatch!(argv)
-      @parser.parse!
-      command, *args = argv
-      command = 'status' unless command
-
-      method = "run_#{command.gsub('-', '_')}"
-      if respond_to?(method)
-        send(method, *args)
-      else
-        abort!("Unknown command: #{command}")
-      end
-    end
-
-    def run_status
-      if last_status && last_status.state == 'success'
-        puts last_status.state
-        exit(0)
-      elsif last_status
-        puts last_status.state
-      else
-        puts 'unknown'
-      end
-
-      exit(1)
+  module CLI
+    def self.run(*args)
+      App.start(*args)
     end
-
-    def run_open
-      unless last_status
-        puts 'No CI run found'
-      end
-      open(last_status.rels[:target].href)
-    end
-
-    def run_token(token=nil)
-      if token
-        repository.config['circleci.token'] = token
-      else
-        puts circle_token
-      end
-    end
-
-    def run_github_token(token=nil)
-      if token
-        repository.config['github.token'] = token
-      else
-        puts github_token
-      end
-    end
-
-    private
-
-    def open(url)
-      `open '#{url}'`
-    end
-
-    def last_status
-      unless defined?(@last_status)
-        @last_status = github_client.statuses(github_repo, head).first
-      end
-      @last_status
-    end
-
-    def github_repo
-      if origin.url =~ %r{git@github.com:(\w+/[^.]*)\.git}
-        $1
-      else
-        raise "Unsupported repo url format #{origin.url.inspect}" # TODO: support other formats, mainly https
-      end
-    end
-
-    def origin
-      @origin ||= repository.remotes.find { |r| r.name == 'origin' }
-    end
-
-    def head
-      repository.head.target_id
-    end
-
-    def repository
-      @repository ||= Rugged::Repository.new('.') # TODO: allow to be called from a subdirectory
-    end
-
-    def github_client
-      @github_client ||= Octokit::Client.new(access_token: github_token)
-    end
-
-    def configure_circle_ci_client
-      CircleCi.configure do |config|
-        config.token = circle_token
-      end
-    end
-
-    def github_token # TODO: github-token should probably be in a global config
-      repository.config['github.token'] || abort!(%{Missing GitHub token.
-You can create one here: https://github.com/settings/tokens/new
-And add it with the following command: $ circle github-token YOUR_TOKEN})
-    end
-
-    def circle_token
-      repository.config['circleci.token'] || abort!(%{Missing CircleCI token.
-You can create one here: https://circleci.com/account/api
-And add it with the following command: $ circle token YOUR_TOKEN})
-    end
-
-    def abort!(message, code=1)
-      STDERR.puts(message)
-      exit(code)
-    end
-
   end
 end

data/lib/circle/cli/app.rb

@@ -0,0 +1,192 @@
+require 'launchy'
+require 'circle/cli/repo'
+require 'circle/cli/project'
+
+module Circle
+  module CLI
+    class App < Thor
+      CIRCLE_URL = 'https://circleci.com/account/api'
+
+      LOGIN_HELP = <<-EOMSG
+1. Press [enter], and you'll be taken CircleCI.
+2. Enter a name for your new token.
+3. Click 'Create new token'.
+4. Come back to your prompt and paste in your new token.
+5. Press enter to complete the process.
+      EOMSG
+
+      NO_TOKEN_MESSAGE = <<-EOMSG
+CircleCI token hasn't been configured. Run the following command to login:
+
+  $ circle login
+      EOMSG
+
+      default_task :status
+      class_option :repo, default: '.', desc: 'path to repo'
+
+      desc 'status', 'show CircleCI build result'
+      method_option :branch, desc: 'branch name'
+      def status
+        validate_repo!
+        validate_latest!
+        display_status
+      end
+
+      desc 'watch', 'watch your build'
+      method_option :branch, desc: 'branch name'
+      method_option :poll, default: 5, desc: 'polling frequency', type: :numeric
+      def watch
+        validate_repo!
+        validate_latest!
+        watching -> { project.latest.preload } do
+          display_status
+        end
+      end
+
+      desc 'overview', 'list recent builds and their statuses for all branches'
+      method_option :watch, desc: 'watch the list of builds'
+      method_option :poll, default: 5, desc: 'polling frequency', type: :numeric
+      def overview
+        validate_repo!
+        abort! 'No recent builds.' if project.recent_builds.empty?
+        show_overview = -> { display_builds(project.recent_builds) }
+
+        if options[:watch]
+          watching(-> { project.recent_builds  }, &show_overview)
+        else
+          show_overview
+        end
+      end
+
+      desc 'open', 'open CircleCI build'
+      method_option :branch, desc: 'branch name'
+      def open
+        validate_repo!
+        validate_latest!
+        Launchy.open latest[:build_url]
+      end
+
+      desc 'build', 'trigger a build on circle ci'
+      method_option :branch, desc: 'branch name'
+      def build
+        validate_repo!
+        project.build!
+        say "A build has been triggered.\n\n", :green
+        invoke :watch
+      end
+
+      desc 'cancel', 'cancel most recent build'
+      method_option :branch, desc: 'branch name'
+      def cancel
+        validate_repo!
+        validate_latest!
+        latest.cancel! unless latest.finished?
+        invoke :status
+        say "\nThe build has been cancelled.", :red unless latest.finished?
+      end
+
+      desc 'token', 'view or edit CircleCI token'
+      def token(value = nil)
+        if value
+          repo.circle_token = value
+        elsif value = repo.circle_token
+          say value
+        else
+          say NO_TOKEN_MESSAGE, :yellow
+        end
+      end
+
+      desc 'login', 'login to Circle CI'
+      def login
+        say LOGIN_HELP, :yellow
+        ask set_color("\nPress [enter] to open CircleCI", :blue)
+        Launchy.open(CIRCLE_URL)
+        value = ask set_color('Enter your token:', :blue)
+        repo.circle_token = value
+        say "\nYour token has been set to '#{value}'.", :green
+      end
+
+      private
+
+      def repo
+        @repo ||= Repo.new(options)
+      end
+
+      def project
+        @project ||= Project.new(repo)
+      end
+
+      def latest
+        project.latest
+      end
+
+      def validate_repo!
+        abort! "Unsupported repo url format #{repo.uri}" unless repo.uri.github?
+        abort! NO_TOKEN_MESSAGE unless repo.circle_token
+      end
+
+      def validate_latest!
+        abort! 'No CircleCI builds found.' unless project.latest
+      end
+
+      def abort!(message)
+        abort set_color(message, :red)
+      end
+
+      def watching(preloader)
+        loop do
+          yield
+          sleep options[:poll]
+          project.clear_cache!
+          preloader.call
+          system('clear') || system('cls')
+        end
+      rescue Interrupt
+        exit 0
+      end
+
+      def display(description, value, color)
+        status = set_color description.ljust(15), :bold
+        result = set_color value.to_s, color
+        say "#{status} #{result}"
+      end
+
+      def display_status
+        say "#{latest[:subject]}\n\n", :cyan if latest[:subject]
+        display 'Build status', latest.status, latest.color
+        display 'Started at', latest.formatted_start_time, latest.color
+        display 'Finished at', latest.formatted_stop_time, latest.color
+        display 'Compare', latest[:compare], latest.color if latest[:compare]
+        display_steps latest.steps unless latest.steps.empty?
+        display_failures latest.failing_tests unless latest.failing_tests.empty?
+        exit 1 if latest.failed?
+        exit 0 if latest.finished?
+      end
+
+      def display_steps(steps)
+        say "\nSteps:", :bold
+
+        print_table steps.map { |step|
+          [set_color(step[:name], step.color), step.duration]
+        }
+      end
+
+      def display_failures(failures)
+        say "\nFailing specs:", :bold
+
+        print_table failures.map { |spec|
+          [set_color(spec['file'], :red), spec['name']]
+        }
+      end
+
+      def display_builds(builds)
+        print_table builds.map { |build|
+          branch = set_color(build[:branch], :bold)
+          status = set_color(build.status, build.color)
+          started = build.formatted_start_time
+          [branch, status, build.subject, started]
+        }
+      end
+    end
+  end
+end