yapt 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f3d3e6e3a120cd87f9c1cc545edd9ac08eb22ac
-  data.tar.gz: 2257eedb5a60cc3bc2ee63cf40c878c92f9e9ec6
+  metadata.gz: 23de5c03a7ac130c7f824eb67fb29f3e16f33a52
+  data.tar.gz: 1cc941043e57e0e3557d506bb2f176d0dddf7d1f
 SHA512:
-  metadata.gz: 839df234bc2acc4db310d0abc5994a505dfb3ce95902e572b0a62d5bbbe7a0afa51d1935cf2520cd07b15098f9484e1e2f68b6eab4512db68e211b8da15b70e6
-  data.tar.gz: 9aecd0b88395d255541d8b39361a3c9cc69af75a3c43dd588bd6df64581b65be57f772530a0b63646079d1bbd9bc0fc99ba67c7a17fba3995d62dfaac0c466b8
+  metadata.gz: a700985a6d0e2e93665ffa341acec9b17c01cdc498c2f2e2d0274411f8918ef897f1b9689766d8f64076f5b6923fc4c41e944f540fc57298a01e15f2d89df9fb
+  data.tar.gz: db5d1a4cfb1d4d4e237838dc490532375ae6dfe1bb64f2ce29718e87220dbd58c6ef772531ac11898b8da0e785a5312ac0896fb67092e53b56b0a2798c3f85a9

data/.gitignore

@@ -15,5 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.env
+.yapt
 .yapt_member_cache

data/Gemfile

@@ -3,5 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in yapt.gemspec
 gemspec
 
-gem "dotenv"
 gem "pry"

data/README.md

@@ -8,13 +8,35 @@ A command line Pivotal Tracker client. In early days.
 
 ## Usage
 
-Environment variables: 
+Put these in a yaml .yapt file in your project or ~ directory:
 
 * api_token
 * project_id
 
 yapt list "created_since=last friday" limit=5 keyword
 
+Use a different template with v(iew)=
+
+```
+yapt list v=detail
+yapt list view=simple
+```
+
+Check out an individual story...
+
+```
+yapt show 12345
+```
+
+Move it ...
+
+```
+yapt move 12345 54321 # move 12345 just above 54321
+yapt move 12345 tback # move 12345 to top of backlog
+```
+
+Other keywords: ticebox, tice, bback, tbacklog, bice, bicebox
+
 ## Contributing
 
 1. Fork it

data/lib/yapt/config.rb

@@ -0,0 +1,36 @@
+require 'yaml'
+
+module Yapt
+  class Config
+    attr_reader :project_path
+    def initialize(project_path)
+      @project_path = project_path
+    end
+
+    def project_id
+      config.fetch('project_id')
+    end
+
+    def api_token
+      config.fetch('api_token')
+    end
+
+    private
+
+    def load_or_hash(path)
+      YAML.load_file(path) rescue Hash.new
+    end
+
+    def config
+      @config ||= user_config.merge(project_config)
+    end
+
+    def project_config
+      load_or_hash("#{project_path}/.yapt")
+    end
+
+    def user_config
+      load_or_hash("#{Dir.home}/.yapt")
+    end
+  end
+end

data/lib/yapt/filter.rb

@@ -1,4 +1,3 @@
-require 'pry'
 require "chronic"
 
 module Yapt
@@ -6,7 +5,6 @@ module Yapt
     def self.parse(args)
       args.inject({filter: ""}) do |query, arg|
         filter = new(arg)
-        # binding.pry
         if filter.filter?
           query[:filter] += "#{filter.to_filter} "
         else

data/lib/yapt/move.rb

@@ -0,0 +1,28 @@
+module Yapt
+  class Move
+    def self.setup(id, target_id)
+      to_move = Story.find(id)
+      target = Story.find(target_id)
+      new(to_move, target)
+    end
+
+    attr_reader :to_move, :target
+    def initialize(to_move, target)
+      @to_move, @target = to_move, target
+    end
+
+    def description
+      "Move #{to_move.id} just above #{target.id}"
+    end
+
+    def params
+      {
+        before_id: target.id
+      }
+    end
+
+    def execute!
+      Request.new("stories/#{to_move.id}", params, :put).result
+    end
+  end
+end

data/lib/yapt/request.rb

@@ -2,24 +2,41 @@ require "rest-client"
 
 module Yapt
   class Request
+    attr_reader :method, :path, :params
     def initialize(path, params = {}, method = :get)
-      @text_result = send(method, path, params)
+      @method, @path, @params = method, path, params
     end
 
     def result
-      JSON.parse(@text_result)
+      request(method, params)
     end
 
-    def get(path, params={})
-      url = "#{base_url}/#{path}"
-      RestClient.get url,
-        {
-          params: params,
-          "X-TrackerToken" => Yapt.api_token
+    def request(method, payload)
+      options = {
+          "X-TrackerToken" => Yapt.api_token,
+          "Content-Type" => "application/json"
         }
+      response_handling = ->(response, request, result, &block) {
+        case response.code
+        when 200
+          JSON.parse(response.to_s)
+        else
+          puts "Non-200 response!"
+          puts response.to_s
+        end
+      }
+      if method == :get
+        RestClient.get(url, options.merge(params: payload), &response_handling)
+      else
+        RestClient.send(method, url, payload, options, &response_handling)
+      end
     end
 
-    def base_url
+    def url
+      "#{self.class.base_url}/#{path}"
+    end
+
+    def self.base_url
       "https://www.pivotaltracker.com/
        services/v5/projects/#{Yapt.project_id}".gsub(/\s+/,'')
     end

data/lib/yapt/story.rb

@@ -1,11 +1,98 @@
 module Yapt
   class Story
     def self.find(options = ["limit=5"])
+      return find_one(options) if options.kind_of?(String)
       params = Filter.parse(options)
-      puts View.headline(params[:filter])
-      puts
       results = Request.new("stories", params, :get).result
-      View.display(results)
+      results.collect {|r| new(r) }
+    end
+
+    def self.find_one(id)
+      case id
+      when /\A\d+\Z/  then find_by_id(id)
+      when 'tback'    then top_of_backlog
+      when 'tbacklog' then top_of_backlog
+      when 'tice'     then top_of_icebox
+      when 'ticebox'  then top_of_icebox
+
+      when 'bback'    then bottom_of_backlog
+      when 'bbacklog' then bottom_of_backlog
+      when 'bice'     then bottom_of_icebox
+      when 'bicebox'  then bottom_of_icebox
+      end
+    end
+
+    def self.find_by_id(id)
+      new(Request.new("stories/#{id}", {}, :get).result)
+    end
+
+    def self.top_of_backlog
+      find(["state:unstarted", "limit:1"]).first
+    end
+
+    def self.top_of_icebox
+      find(["state:unscheduled", "limit:1"]).first
+    end
+
+    def self.bottom_of_backlog
+      find(["state:unstarted"]).last
+    end
+
+    def self.bottom_of_icebox
+      find(["state:unscheduled"]).last
+    end
+
+    def self.just_url(id)
+      if id
+        "#{base_site_url}/stories/#{id}"
+      else
+        base_site_url
+      end
+    end
+
+    def self.images_url(id)
+      "#{just_url(id)}/images"
+    end
+
+    def self.base_site_url
+      "https://www.pivotaltracker.com/s/projects/#{Yapt.project_id}"
+    end
+
+    attr_reader :raw_story
+    def initialize(raw_story)
+      @raw_story = raw_story
+    end
+
+    [:url, :story_type, :description, :id,
+     :current_state, :labels, :owned_by_id, :created_at, :kind,
+     :project_id, :requested_by_id, :updated_at, :name].each do |attr|
+       define_method attr do
+         raw_story[attr.to_s]
+       end
+    end
+
+    def owner_initials
+      if owned_by_id
+        "Owner: #{Member.find(owned_by_id).initials}"
+      else
+        "No owner"
+      end
+    end
+
+    def requester_initials
+      "Requester: #{Member.find(requested_by_id).initials}"
+    end
+
+    def created_at_display
+      "Created: #{time_display(created_at)}"
+    end
+
+    def updated_at_display
+      "Updated: #{time_display(updated_at)}"
+    end
+
+    def time_display(time)
+      Time.parse(time).strftime("%a %d%b %I:%M")
     end
   end
 end

data/lib/yapt/templates/detail.erb

@@ -0,0 +1,12 @@
+<% @stories.each do |story| -%>
+<%= story.id %>  | <%= story.name %>
+<%= story.description %>
+<%= '-' * 100 %>
+<%= story.created_at_display %> | <%= story.updated_at_display %> | <%= story.current_state %> | <%= story.requester_initials %> | <%= story.owner_initials %>
+<%= '=' * 100 %>
+<% end %>
+<% if false %>
+  [:url, :story_type, :description, :id,
+   :current_state, :labels, :owned_by_id, :created_at, :kind,
+   :project_id, :requested_by_id, :updated_at, :name].each do |attr|
+ <% end %>

data/lib/yapt/templates/simple.erb

@@ -0,0 +1,3 @@
+<% @stories.each do |story| -%>
+  <%= story.id %> | <%= story.name %>
+<% end %>

data/lib/yapt/version.rb

@@ -1,3 +1,3 @@
 module Yapt
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/yapt/view.rb

@@ -1,75 +1,29 @@
-require "ostruct"
+require 'erb'
 
 module Yapt
   class View
-    extend Forwardable
-
-    def_delegators :@story, :url, :story_type, :description, :id,
-      :current_state, :labels, :owned_by_id, :created_at, :kind,
-      :project_id, :requested_by_id, :updated_at, :name
-
-    def self.headline(str)
-      "About to display: #{str}"
-    end
-
-    def self.display(stories)
-      stories.inject("") do |str, story|
-        str + new(story).to_s
-      end
+    def self.extract_display_config(args)
+      display = args.detect {|a| a =~ /\Av(iew)?[=:]/ }
+      args.delete(display)
+      display ? display.split(/[=:]/).last : nil
     end
 
-    attr_reader :story
-    def initialize(story)
-      @story = OpenStruct.new(story)
+    def initialize(stories)
+      @stories = stories
     end
 
-    def to_s
-      [:id, :story_type, :current_state, :name, :nl,
-       :created_at_display, :updated_at_display,
-       :owner_initials, :requester_initials,
-       :nl, :nl
-      ].inject("") do |str, element|
-        str += "#{send(element)}"
-        element == :nl ? str : "#{str} | "
-      end.gsub(/\| $/, '')
-    end
-
-    private
-
-    def owner_initials
-      if owned_by_id
-        "Owner: #{Member.find(owned_by_id).initials}"
+    def display(template_name)
+      template_path = "#{template_dir}/#{template_name}.erb"
+      if File.exists?(template_path)
+        template = IO.read template_path
+        ERB.new(template, 0, '-').result(binding)
       else
-        "No owner"
+        raise "#{template_path} missing!"
       end
     end
 
-    def requester_initials
-      "Requester: #{Member.find(requested_by_id).initials}"
-    end
-
-    def created_at_display
-      "Created: #{time_display(created_at)}"
-    end
-
-    def updated_at_display
-      "Updated: #{time_display(updated_at)}"
-    end
-
-    def time_display(time)
-      Time.parse(time).strftime("%a %d%b %I:%M")
-    end
-
-    def id_name
-      "#{story.id} | #{story.name}\n"
-    end
-
-    def nl
-      "\n"
+    def template_dir
+      "#{File.dirname(__FILE__)}/templates"
     end
   end
 end
-# ["url", "story_type", "description", "id", "current_state",
- # "labels", "owned_by_id", "created_at", "kind", "project_id",
- # "requested_by_id", "updated_at", "name"]
-

data/lib/yapt.rb

@@ -1,5 +1,5 @@
-require 'dotenv'
-Dotenv.load
+require 'pry'
+require 'highline/import'
 
 module Yapt
   autoload :VERSION, "yapt/version"
@@ -8,13 +8,19 @@ module Yapt
   autoload :View, "yapt/view"
   autoload :Member, "yapt/member"
   autoload :Request, "yapt/request"
+  autoload :Config, "yapt/config"
+  autoload :Move, "yapt/move"
+
+  def self.config
+    @config ||= Config.new(Dir.pwd)
+  end
 
   def self.project_id
-    @project_id ||= ENV['project_id']
+    config.project_id
   end
 
   def self.api_token
-    @api_token ||= ENV['api_token']
+    config.api_token
   end
 
   def self.cache_duration
@@ -30,20 +36,60 @@ module Yapt
   end
 
   class Runner < Boson::Runner
-    # option :urgent, type: :boolean
+    attr_reader :start_time
+    def initialize
+      @start_time = Time.now
+      super
+    end
+
     def list(*args)
+      display_config = View.extract_display_config(args)
+      @stories = Story.find(args)
+      display_config ||= (@stories.length > 1) ? "simple" : "detail"
+      output View.new(@stories).display(display_config)
+    end
+
+    def show(id)
+      @story = Story.find(id)
+      output View.new([@story]).display("detail")
+    end
+
+    def open(id = nil)
+     system_open Story.just_url(id)
+    end
+
+    def images(id)
+      system_open Story.images_url(id)
+    end
+
+    def move(id, destination)
+      mover = Move.setup(id, destination)
       puts
-      puts Story.find(args)
-      puts
-      puts args.inspect
+      puts mover.description
+      puts View.new([mover.to_move, mover.target]).display("simple")
+
+      permission = ask("Make this move?  ").downcase
+      if %w(y yes).include?(permission)
+        mover.execute!
+        puts "Moved!"
+      else
+        puts "Aborted. Oh well."
+      end
     end
 
-    def members
-      Member.cache
+    private
+
+    def system_open(whatever)
+      puts "Opening: #{whatever}"
+      system "open #{whatever}"
     end
 
-    def moo
-      puts "MOOOO"
+    def output(str)
+      puts
+      puts str
+      puts
+      puts "Took #{Time.now - start_time} seconds."
+      puts
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yapt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sam Schenkman-Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -109,10 +109,14 @@ files:
 - Rakefile
 - bin/yapt
 - lib/yapt.rb
+- lib/yapt/config.rb
 - lib/yapt/filter.rb
 - lib/yapt/member.rb
+- lib/yapt/move.rb
 - lib/yapt/request.rb
 - lib/yapt/story.rb
+- lib/yapt/templates/detail.erb
+- lib/yapt/templates/simple.erb
 - lib/yapt/version.rb
 - lib/yapt/view.rb
 - yapt.gemspec