drone-builds 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573c8e1088e883fea7522342bd5abc2ec5f3014c
-  data.tar.gz: c1c00080331b2014bac34bca4450639fa0ca8405
+  metadata.gz: 7669c5cd94aadf34b8c0ffc3abdec4bd96667a98
+  data.tar.gz: e19d1a73b9d8f02372816aabb9db20843b1ffb17
 SHA512:
-  metadata.gz: 470076dc1140d472d310cb086d9c1fdcb2dcbbf72588a6095f8f297f7234492d404431984e2002843c875a971ab7bdc8ac90613571c7f56e13aca33819bb4380
-  data.tar.gz: 93697e8e362b24e2161a0480c2af5cd877a654d3d762144ba25e4a6e7b06fd85024f3c75408663554431e4dc19f4460377021a8a444ba4d777d7aef2855a8268
+  metadata.gz: 23bb8201340113d18b5f85948bcd3951ee83a65763403e538701c86a4fe51a9a0117e34f8097b33282d38de4426ec70b70e9b2853d7162d6de3d3ea0cd24e9d7
+  data.tar.gz: c7173aab373a38ded30d8a9ec9064ca1e5f5671ae5350ae3fd84de3ca9c0f813fb3c40886a9573188981d473218d699236ccb0ba24419c4e95f0609e331bf494

data/lib/drone/builds/cli.rb

@@ -15,31 +15,31 @@ class Drone::Builds::Cli < Thor
   desc 'list', 'list last builds'
   method_option :limit, type: :numeric, default: LIMIT, aliases: '-l', desc: 'number of builds shown'
   method_option :pull, type: :numeric, aliases: '-p', desc: 'pull request ID on GitHub'
+  method_option :branch, type: :string, aliases: '-b', desc: 'builds on that branch'
   def list
-    limit = options[:pull] ? Drone::Builds::MAX_LIMIT : options[:limit]
+    ref = self.class.options_to_ref(options)
 
-    builds = self.class.parser.parse_builds(self.class.client.list(limit: limit))
+    builds = self.class.parser.parse_builds(self.class.client.list(limit: options[:limit], ref: ref))
 
-    builds = builds.select { |build| build[:ref] == "##{options[:pull]}" } if options[:pull]
-
-    puts self.class.parser.table(builds.last(options[:limit]], %i[id status ref message])
+    puts self.class.parser.table(builds, %i[id status ref message])
   end
 
   desc 'show', 'show a build'
   method_option :filter, type: :string, aliases: '-f', desc: 'filter builds output lines'
   method_option :context, type: :numeric, aliases: '-c', desc: 'number of lines after filter match'
   method_option :last, type: :numeric, default: 1, aliases: '-l', desc: 'show nth last build'
+  method_option :pull, type: :numeric, aliases: '-p', desc: 'show last build from pull request ID'
+  method_option :branch, type: :string, aliases: '-b', desc: 'builds on that branch'
   def show(id = nil)
-    if id.nil? || id == 'l' || id == 'last'
-      last = self.class.client.list(limit: options[:last].abs)[0]
-      id = last['id'] if last
-    end
+    ref = self.class.options_to_ref(options)
 
-    abort 'id is required' if id.to_s.empty?
+    id = self.class.client.list(limit: options[:last].abs, ref: ref)[0]['id'] if id.to_i.to_s != id
 
     self.class.client.show(id, filter: options[:filter], context: options[:context]) do |line|
       puts line
     end
+  rescue
+    abort "No build found for options: #{options}"
   end
 
   desc 'version', 'version used'
@@ -63,4 +63,12 @@ class Drone::Builds::Cli < Thor
         job_id: HOME_ENV[:DRONECI_JOB_ID]
       )
   end
+
+
+  def self.options_to_ref(options)
+    ref = nil
+    ref = "refs/heads/#{options[:branch]}" if options[:branch]
+    ref = "refs/pull/#{options[:pull]}/head" if options[:pull]
+    ref
+  end
 end

data/lib/drone/builds/version.rb

@@ -1,5 +1,5 @@
 module Drone
   class Builds
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.3.1'.freeze
   end
 end

data/lib/drone/builds.rb

@@ -20,8 +20,8 @@ module Drone
       @protocol = protocol || 'http'
     end
 
-    def list(limit: nil)
-      json_api(builds_url).first(limit || DEFAULT_LIMIT).reverse
+    def list(limit: nil, ref: nil)
+      json_api(builds_url).select { |b| !ref || b["ref"] == ref }.first(limit || DEFAULT_LIMIT).reverse
     end
 
     def show(id, filter: nil, context: nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drone-builds
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dorian Marié