pt 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c872c7de07ff476f016e21cd526a26cde532c61
-  data.tar.gz: 2b5cd00d28ad94fcf20842d6c50b9eb02bf4ef8d
+  metadata.gz: 0c8f668fcc562a3434ef7c4254e2d00d1598c49a
+  data.tar.gz: 7f022d8b46d4e628af5d0aee958368d5196c0497
 SHA512:
-  metadata.gz: dae2f14490c2b022db21fc2f5408e29365907091b0f41992aa65577f2aeac8b037f41d4487459042ec05aaedba4489c67ae184391b31f571c8abe137de328535
-  data.tar.gz: eccedbf39e375f0389423657e0bf9abab46600211ed377735e91a4b364ac2798422a5269dfc1eebdb44efa246c48f031ff6ba6cefec078d26ab6ca66bccee6a6
+  metadata.gz: d9126e08e452d2e25573a2a5ed5bb91d42ec6dfa2d3c7af3095a56aec121d9c4cf75cbeb82325ab27fc86a4b755b5ec5cdfa30129629b6ad5384ba35a16ee5c2
+  data.tar.gz: e2a021d5eb32c5bd49d2aef9fe46808ddf6f151fbcd80d43daaaa900f704aee476fd99c8f347f5863a2cf2ce84e23ab6c0feb0f29b1fd85ec062e0d573629fdd

data/Changelog.md

@@ -1,8 +1,9 @@
 # pt changelog
 
+## v0.10.0
+- remove interactive pagination, pagination option can be set through cli flag ( --page and --limit )
 ## v0.9.0
 - add pagination for long stories (limit: default is 20, can be changed by set :limit: on local .pt file)
--
 
 ## v0.8.6
 - replace ruby save navigation operator

data/lib/pt/cli.rb

@@ -10,6 +10,9 @@ module PT
     include PT::Helper
     attr_reader :project
 
+    class_option "limit", aliases: :l, type: :numeric, default: 10, desc: 'change limit'
+    class_option "page", aliases: :p, type: :numeric, desc: 'show n-th page'
+
     def initialize(*args)
       super
       @io = HighLine.new
@@ -24,15 +27,14 @@ module PT
       define_method(state.to_sym) do  |owner = nil|
         filter =  "state:#{state}"
         filter << " owner:#{owner}" if owner
-        story = select_story_from_paginated_table do |page|
-          @client.get_stories(filter: filter, page: page)
-        end
-        show_story(story)
+        stories = @client.get_stories(filter: filter, page: options[:page], limit: options[:limit])
+        print_stories_table(stories)
       end
     end
 
     %w[show tasks open assign comments label estimate start finish deliver accept reject done].each do |action|
       desc "#{action} [id]", "#{action} story"
+      method_option "interactive", aliases: :i, type: :boolean, default: true, desc: 'enable interactive method'
       define_method(action.to_sym) do |story_id = nil|
         if story_id
           story = task_by_id_or_pt_id(story_id.to_i)
@@ -42,13 +44,12 @@ module PT
           end
         else
           method_name = "get_stories_to_#{action}"
-          story = select_story_from_paginated_table do |page|
-            if @client.respond_to?(method_name.to_sym)
-              @client.send("get_stories_to_#{action}", page: page)
-            else
-              @client.get_stories(page: page)
-            end
+          stories = if @client.respond_to?(method_name.to_sym)
+            @client.send("get_stories_to_#{action}", page: options[:page], limit: options[:limit])
+          else
+            @client.get_stories(page: options[:page], limit: options[:limit])
           end
+          story = select_story_from_paginated_table(stories)
         end
         title("#{action} '#{story.name}'")
         send("#{action}_story", story)
@@ -57,10 +58,8 @@ module PT
 
     desc 'mywork', 'list all your stories'
     def mywork
-      story = select_story_from_paginated_table do |page|
-        @client.get_stories(filter: "owner:#{@local_config[:user_name]} -state:accepted", page: page)
-      end
-      show_story(story)
+      stories = @client.get_stories(filter: "owner:#{@local_config[:user_name]} -state:accepted", page: options[:page])
+      print_stories_table(stories)
     end
 
     desc "list [owner]", "list all stories from owner"
@@ -68,10 +67,8 @@ module PT
       if owner
         if owner == "all"
           stories = @client.get_work
-          TasksTable.new(stories).print @global_config
         else
           stories = @client.get_my_work(owner)
-          TasksTable.new(stories).print @global_config
         end
       else
         members = @client.get_members
@@ -79,8 +76,8 @@ module PT
         user = select("Please select a member to see his tasks.", table).name
         title("Work for #{user} in #{project_to_s}")
         stories = @client.get_my_work(user)
-        TasksTable.new(stories).print @global_config
       end
+      print_stories_table(stories)
     end
 
     desc "recent", "show stories you've recently shown or commented on with pt"
@@ -128,7 +125,6 @@ module PT
         else
           owner = nil
         end
-        requester = @local_config[:user_name]
         type = ask('Type? (c)hore, (b)ug, anything else for feature)')
       end
 
@@ -164,10 +160,8 @@ module PT
 
     desc "find [query] " ,"looks in your stories by title and presents it"
     def find(query)
-      story = select_story_from_paginated_table do |page|
-        @client.get_stories(filter: query, page: page)
-      end
-      show_story(story)
+      stories = @client.get_stories(filter: query, page: options[:page])
+      print_stories_table(stories)
     end
 
     desc "updates","shows number recent activity from your current project"

data/lib/pt/client.rb

@@ -21,6 +21,19 @@ module PT
       @project = @client.project(local_config[:project_id]) if local_config
     end
 
+    def total_page(limit=nil)
+      limit ||= @config[:limit]
+      @total_record = @client.last_response.env.response_headers["X-Tracker-Pagination-Total"]
+      @total_record ? (@total_record.to_f/limit).ceil : 1
+    end
+
+    def current_page(limit=nil)
+      limit ||= @config[:limit]
+      offset = @client.last_response.env.response_headers["X-Tracker-Pagination-Offset"]
+      offset ? ((offset.to_f/limit)+1).to_i.ceil : 1
+    end
+
+
     def get_project(project_id)
       project = @client.project(project_id)
       project
@@ -106,9 +119,9 @@ module PT
     end
 
     def get_stories(params={})
-      limit = config[:limit] || 20
-      page = params[:page] || 0
-      offset = page*limit
+      limit = params[:limit] || config[:limit] || 10
+      page = params[:page] || 1
+      offset = (page-1)*limit
       filter = params[:filter] || '-state=accepted'
       project.stories limit: limit, fields: STORY_FIELDS, auto_paginate: false, offset: offset, filter: filter
     end

data/lib/pt/helper.rb

@@ -112,30 +112,6 @@ module PT
       puts "\n#{split_lines(msg).red.bold}"
     end
 
-    def select(msg, table)
-      if table.length > 0
-        begin
-          table.print @global_config
-          row = ask "#{msg} (1-#{table.length}, 'n' to fetch next data, 'p' to fetch previous data, 'q' to exit)"
-          case row
-          when 'q'
-            quit
-          when 'n'
-            return 'n'
-          when 'p'
-            return 'p'
-          end
-          selected = table[row]
-          error "Invalid selection, try again:" unless selected
-        end until selected
-        selected
-      else
-        table.print @global_config
-        message "Sorry, there are no options to select."
-        quit
-      end
-    end
-
     def quit
       message "bye!"
       exit
@@ -251,20 +227,33 @@ module PT
       save_config( @local_config, get_local_config_path() )
     end
 
-    def select_story_from_paginated_table(&block)
-      prompt = "Please select a story"
-      page = 0
-      begin
-        stories = block.call(page)
-        table = TasksTable.new(stories)
-        story = select(prompt, table)
-        if story == 'n'
-          page+=1
-        elsif story == 'p'
-          page-=1
-        end
-      end while story.kind_of?(String)
-      story
+    def select(msg, table)
+      if table.length > 0
+        begin
+          table.print @global_config
+          row = ask "#{msg} (1-#{table.length}, 'q' to exit)"
+          quit if row == 'q'
+          selected = table[row]
+          error "Invalid selection, try again:" unless selected
+        end until selected
+        selected
+      else
+        table.print @global_config
+        message "Sorry, there are no options to select."
+        quit
+      end
+    end
+
+    def print_stories_table(stories)
+      table = TasksTable.new(stories)
+      puts "[#{@client.current_page(options[:limit])}/#{@client.total_page(options[:limit])}]"
+      table.print @global_config
+    end
+
+    def select_story_from_paginated_table(stories)
+      puts "[#{@client.current_page(options[:limit])}/#{@client.total_page(options[:limit])}]"
+      table = TasksTable.new(stories)
+      select("Please select a story", table)
     end
   end
 end

data/lib/pt/version.rb

@@ -1,3 +1,3 @@
 module PT
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pt
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Slamet Kristanto
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler