get_to_work 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 702f1cb0f80c92a0fc96a1351a93f11dd3799c29
-  data.tar.gz: 95a4703aca307d23da758be2bd0cd9331e3235ff
+  metadata.gz: 99db98a21f49f1746d65a6a247c7e36493b06e17
+  data.tar.gz: 50c64d83496558636bc06bfe78c94f92620accdf
 SHA512:
-  metadata.gz: c981e1db8108d16500160e45620b31804137f9ca155b9c71f12c2d7c1576929a24fcf3b1e626158f5203baf283b8d061d2188ee4896a452f4fd6801bb2dc219c
-  data.tar.gz: 6564d6a0e3aefbfd7a1ff48136b4ff5bb246448b103da5257060aceb47af09a5b44a0c89ec9a1749b8a963d206df9905d077d1d26ecd29038fd407aa78da4aac
+  metadata.gz: e0577c64c70c83fe6a8e54b7b1874c11f59f972d686bc88fb5fe07ceddcac16aad42464f54d322d6b4a21e4931573c341974cf8ebcfda3d0f7fd18adb6452c54
+  data.tar.gz: e14692a6e1efe9287a15004688399c66eb5877dcc7517ed2d8a2be9c29ea0e2f7172c3acfa3a8903566da30ced26389a2f66494ad188d1b50e9cda32410f9a24

data/.rubocop.yml

@@ -4,6 +4,8 @@ AllCops:
     - "vendor/**/*"
     - "db/schema.rb"
   UseCache: false
+Style/LineLength:
+  Max: 130
 Style/CollectionMethods:
   Description: Preferred collection methods.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#map-find-select-reduce-size
@@ -36,7 +38,7 @@ Style/IfUnlessModifier:
   Description: Favor modifier if/unless usage when you have a single-line body.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier
   Enabled: false
-  MaxLineLength: 100
+  MaxLineLength: 130
 Style/OptionHash:
   Description: Don't use option hashes when you can use keyword arguments.
   Enabled: false

data/lib/get_to_work.rb

@@ -11,6 +11,7 @@ require "get_to_work/keychain"
 require "get_to_work/command/bootstrap"
 require "get_to_work/command/start"
 require "get_to_work/command/stop"
+require "get_to_work/command/last_story"
 require "get_to_work/service"
 require "get_to_work/service/pivotal_tracker"
 require "get_to_work/service/harvest"

data/lib/get_to_work/cli.rb

@@ -1,20 +1,23 @@
 module GetToWork
   class CLI < Thor
-    include GetToWork::Menu
-
     desc "bootstrap", "creates .gtw configuration for your current working directory"
     def bootstrap
-      GetToWork::Command::Bootstrap.run(cli: self)
+      GetToWork::Command::Bootstrap.run
     end
 
     desc "start <Pivotal Tracker Story ID or URL>", "start working on a pivotal tracker story"
     def start(pt_id = nil)
-      GetToWork::Command::Start.run(cli: self, pt_id: pt_id)
+      GetToWork::Command::Start.run(pt_id: pt_id)
     end
 
     desc "stop", "#stop working on your current story"
     def stop
-      GetToWork::Command::Stop.run(cli: self)
+      GetToWork::Command::Stop.run
+    end
+
+    desc "last_story", "returns the id of the last story started"
+    def last_story
+      GetToWork::Command::LastStory.run
     end
   end
 end

data/lib/get_to_work/command.rb

@@ -2,13 +2,15 @@ require "keychain"
 
 module GetToWork
   class Command
+    include Thor::Shell
+    include GetToWork::Menu
+
     def self.run(opts = {})
       trap("SIGINT") { exit! }
       new(opts).run
     end
 
     def initialize(opts = {})
-      @cli = opts[:cli]
     end
 
     def config_file

data/lib/get_to_work/command/bootstrap.rb

@@ -1,15 +1,13 @@
 module GetToWork
   class Command
     class Bootstrap < GetToWork::Command
-      KEYCHAIN_SERVICE = "GetToWork::PivotalTracker".freeze
-
-      def run(opts = {})
+      def run
         check_for_config_file
 
         pt = GetToWork::Service::PivotalTracker.new
 
-        @cli.say "\n\nStep #1 #{pt.display_name} Setup", :magenta
-        @cli.say "-----------------------------", :magenta
+        shell.say "\n\nStep #1 #{pt.display_name} Setup", :magenta
+        shell.say "-----------------------------", :magenta
 
         if pt.keychain
           pt.authenticate_with_keychain
@@ -23,9 +21,8 @@ module GetToWork
 
         GetToWork::ConfigFile.save
 
-
-        @cli.say "\n\nStep #2 #{harvest_service.display_name} Setup", :magenta
-        @cli.say "-----------------------------", :magenta
+        shell.say "\n\nStep #2 #{harvest_service.display_name} Setup", :magenta
+        shell.say "-----------------------------", :magenta
 
         unless harvest_service.authenticate_with_keychain
           subdomain, username, password = prompt_for_subdomain_and_login(harvest_service)
@@ -50,36 +47,34 @@ module GetToWork
       end
 
       def check_for_config_file
-        @config_file = GetToWork::ConfigFile.instance
-
-        if @config_file
-          unless @cli.yes?("Would you like to overwrite your existing #{GetToWork::ConfigFile.filename} file? [y/N]", :green)
+        if config_file
+          unless shell.yes?("Would you like to overwrite your existing #{GetToWork::ConfigFile.filename} file? [y/N]", :green)
             exit(0)
           end
         end
       end
 
       def prompt_for_login(service)
-        username = @cli.ask "#{service.display_name} Username:", :green
-        password = @cli.ask "#{service.display_name} Password:", :green, echo: false
+        username = shell.ask "#{service.display_name} Username:", :green
+        password = shell.ask "#{service.display_name} Password:", :green, echo: false
 
         [username, password]
       end
 
       def prompt_for_subdomain_and_login(service)
-        subdomain = @cli.ask "#{service.display_name} Subdomain:", :green
+        subdomain = shell.ask "#{service.display_name} Subdomain:", :green
         username, password = prompt_for_login(service)
 
         [subdomain, username, password]
       end
 
       def auth_with_service(service:, username:, password:, subdomain: nil)
-        @cli.say "\n\nAuthenticating with #{service.display_name}...", :magenta
+        shell.say "\n\nAuthenticating with #{service.display_name}...", :magenta
 
         begin
           service.authenticate(username: username, password: password, subdomain: subdomain)
         rescue Service::UnauthorizedError
-          @cli.say "Could not authenticate with #{service.display_name}", :red
+          shell.say "Could not authenticate with #{service.display_name}", :red
           exit(1)
         end
 
@@ -89,7 +84,7 @@ module GetToWork
       def prompt_select_project(service)
         project_options = GetToWork::MenuPresenter.with_collection(service.projects)
 
-        @cli.menu_ask(
+        menu_ask(
           "\nSelect a #{service.display_name} project:",
           project_options,
           :green,
@@ -98,9 +93,13 @@ module GetToWork
       end
 
       def prompt_select_tasks(service, project)
-        project_options = GetToWork::MenuPresenter.with_collection(project["tasks"])
+        tasks = project["tasks"].sort do |x, y|
+          x[:name] <=> y[:name]
+        end
+
+        project_options = GetToWork::MenuPresenter.with_collection(tasks)
 
-        selected_project = @cli.menu_ask(
+        menu_ask(
           "\nSelect a #{service.display_name} Task:",
           project_options,
           :green,

data/lib/get_to_work/command/last_story.rb

@@ -0,0 +1,11 @@
+module GetToWork
+  class Command
+    class LastStory < GetToWork::Command
+      def run
+        pt_data = config_file.data["pivotal_tracker"]
+        last_story_id = pt_data && pt_data["project_id"]
+        shell.say(last_story_id)
+      end
+    end
+  end
+end

data/lib/get_to_work/command/start.rb

@@ -32,10 +32,10 @@ module GetToWork
         last_story = config_file["last_story"]
 
         if last_story
-          @cli.say "\nWould you like to start a timer for your last story?", :green
-          @cli.say "  ##{last_story[:id.to_s]} ", [:bold, :cyan]
-          @cli.say "#{last_story[:name.to_s]}", :magenta
-          answer = @cli.yes? "\n[y/N]", :green
+          shell.say "\nWould you like to start a timer for your last story?", :green
+          shell.say "  ##{last_story[:id.to_s]} ", [:bold, :cyan]
+          shell.say "#{last_story[:name.to_s]}", :magenta
+          answer = shell.yes? "\n[y/N]", :green
 
           if answer
             @pt_id = last_story["id"]
@@ -43,7 +43,7 @@ module GetToWork
             exit(0)
           end
         else
-          @cli.say "Couldn't find your last started timer. Please specify a story id."
+          shell.say "Couldn't find your last started timer. Please specify a story id."
           exit(0)
         end
       end

data/lib/get_to_work/command/stop.rb

@@ -3,7 +3,7 @@ module GetToWork
     class Stop < GetToWork::Command
       def run
         if last_timer
-          @cli.say "\nStopping your current timer...\n\n", :green
+          shell.say "\nStopping your current timer...\n\n", :green
           result = harvest_service.stop_timer(last_timer)
 
           if result["id"]
@@ -11,7 +11,7 @@ module GetToWork
             config_file.save
           end
         else
-          @cli.say "\nYour timer has already been stopped.\n\n", :red
+          shell.say "\nYour timer has already been stopped.\n\n", :red
         end
       end
     end

data/lib/get_to_work/menu.rb

@@ -1,7 +1,7 @@
 module GetToWork
   module Menu
     def menu_ask(statement, options, *args)
-      print_table(options.table) # Assuming MenuPresenter type
+      shell.print_table(options.table) # Assuming MenuPresenter type
       choice = ask(statement, *args)
       options.item_for(choice: choice)
     end

data/lib/get_to_work/service/harvest.rb

@@ -52,7 +52,9 @@ module GetToWork
       end
 
       def projects
-        api_client.time.trackable_projects
+        api_client.time.trackable_projects.sort do |x, y|
+          x[:name] <=> y[:name]
+        end
       end
 
       def project

data/lib/get_to_work/service/pivotal_tracker.rb

@@ -58,7 +58,9 @@ module GetToWork
       end
 
       def get_projects
-        api_client.projects
+        api_client.projects.sort do |x, y|
+          x[:name] <=> y[:name]
+        end
       end
 
       def story(story_id)

data/lib/get_to_work/version.rb

@@ -1,3 +1,3 @@
 module GetToWork
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: get_to_work
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Rittersdorf
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -217,6 +217,7 @@ files:
 - lib/get_to_work/cli.rb
 - lib/get_to_work/command.rb
 - lib/get_to_work/command/bootstrap.rb
+- lib/get_to_work/command/last_story.rb
 - lib/get_to_work/command/start.rb
 - lib/get_to_work/command/stop.rb
 - lib/get_to_work/config_file.rb