time_log_robot 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d5097db263a7073c5b5c858536dabfe61ced24e
-  data.tar.gz: 381891c32f3499ecbcb611395db2294f1018b923
+  metadata.gz: 988c8965a9c707284a9309e134f39ba5c03de1bd
+  data.tar.gz: 21dac20a7c85acd1465c4bf709555960d4945c2b
 SHA512:
-  metadata.gz: 03c8d6335b209654b4b4f37c18b894cce613639d40e4167e5a8aefb79f02f6f40f64a0a6ba8eaf1c468a8cf1087ffdd1f162fd597b6a4e04af09f2693bfd2fbd
-  data.tar.gz: 791e6755bfd9a6a6768eba806a709c94713f1d273d8215dbb4d37f6d7d19c15eac1e3420e9280e10661de07d9013a103f6d9fae7e53ac5b8f5f0e9fca1e2f907
+  metadata.gz: 21ece193667a30cdb9cd147465b3a670c11015abca96f10ef637bfe7ad520f6b3c4f431dae25a4dbe8306020493aa8f7f9db9e1ff424f83591c52ca0ba8c8df9
+  data.tar.gz: 3c9b4f00aae5677a921b2d5e9651e7c7f5ee015ebde65853b1f30c1652ed7bc427c33f7d54786faae790fcca88926c1d989e38fa740a0dc69bb46c47f0fe379d

data/CONTRIBUTING.md

@@ -0,0 +1,58 @@
+Contributing
+============
+
+We love pull requests from everyone. By participating in this project, you agree
+to abide by the [contributor covenant].
+
+[contributor covenant v1.4]: http://contributor-covenant.org/version/1/4/
+
+Here's a quick guide for contributing:
+
+1. Fork the repo.
+
+1. Run the tests. We only take pull requests with passing tests, and it's great
+to know that you have a clean slate: `bundle && bundle exec rake`
+
+1. Add a test for your change. Only refactoring and documentation changes
+require no new tests. If you are adding functionality or fixing a bug, we need
+a test!
+
+1. Make the test pass.
+
+1. Push to your fork and submit a pull request.
+
+At this point you're waiting on us. We like to at least comment on, if not
+accept, pull requests within seven business days. We may suggest some changes or improvements or
+alternatives.
+
+Some things that will increase the chance that your pull request is accepted,
+taken straight from the Ruby on Rails guide:
+
+* Use Rails idioms and helpers
+* Include tests that fail without your code, and pass with it
+* Update the documentation, the surrounding one, examples elsewhere, guides,
+  whatever is affected by your contribution
+
+Running Tests
+-------------
+
+time_log_robot uses [minitest](https://github.com/seattlerb/minitest) for its unit tests. If you submit
+tests that are not written for minitest without a very good reason, you
+will be asked to rewrite them before we'll accept.
+
+### To run a full test suite:
+
+    bundle exec rake
+
+This will run RSpec and Cucumber against all version of Rails
+
+### To run single test file
+
+    bundle exec rake test TEST=test/test_foobar.rb
+    
+Syntax
+------
+
+Please follow the [Ruby style guide](https://github.com/bbatsov/ruby-style-guide). 
+Rubocop will be used on Pull Requests. If you submit code that deviates from this style, 
+you will be asked to justify it, and may be asked to change it.

data/Gemfile.lock

@@ -1,19 +1,12 @@
 PATH
   remote: .
   specs:
-    time_log_robot (0.3.0)
-      activesupport (~> 4.2, >= 4.2.6)
+    time_log_robot (0.4.0)
       httparty (~> 0.13, >= 0.13.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
     ansi (1.5.0)
     builder (3.2.2)
     codeclimate-test-reporter (0.6.0)
@@ -22,7 +15,6 @@ GEM
     docile (1.1.5)
     httparty (0.14.0)
       multi_xml (>= 0.5.2)
-    i18n (0.7.0)
     json (1.8.1)
     method_source (0.8.2)
     minitest (5.9.0)
@@ -44,9 +36,6 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -7,7 +7,6 @@ task :console do
   require 'irb/completion'
   require 'pp'
   require 'yaml'
-  require 'active_support'
   require 'httparty'
   Dir[File.expand_path "lib/**/*.rb"].each{|file| require_relative file }
   ARGV.clear
@@ -19,4 +18,4 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task default: :test
+task default: :test

data/lib/time_log_robot/toggl/entry.rb

@@ -13,7 +13,7 @@ module TimeLogRobot
 
       def comment
         matches = raw_entry['description'].match(/(\{(?<comment>[^\}]*)\})/)
-        return matches['comment'] if matches.present?
+        return matches['comment'] unless matches.nil? || !matches.strip.empty?
         description
       end
 

data/lib/time_log_robot/toggl/report.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/date/calculations'
-
 module TimeLogRobot
   module Toggl
     class Report
@@ -10,7 +8,7 @@ module TimeLogRobot
       # TODO Refactor to avoid having to pass around `since` so much
       class << self
         def fetch(since: nil)
-          since ||= Date.today.beginning_of_week(:saturday).to_time
+          since = since_or_default(since)
           response = get('/details', basic_auth: auth, query: query(since))
           if response.success?
             pages = number_of_pages(response['total_count'])
@@ -21,8 +19,28 @@ module TimeLogRobot
         end
         class FetchError < Exception; end
 
+        def since_or_default(since)
+          since || default_since
+        end
+
         private
 
+        def default_since
+          # DAYNAMES structure:
+          #  ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
+          # Therefore saturday index is 6, calculate it anyways incase it changes
+          saturday_index = Date::DAYNAMES.index("Saturday")
+          today_index = Date.today.wday
+
+          # Return today if it is Saturday (this is what the previous
+          # implementation would do)
+          return Date.today.to_time if today_index == saturday_index
+
+          # Otherwise, subtract the index + 1 (to account
+          # for indecies starting at 0)
+          (Date.today - (today_index + 1)).to_time
+        end
+
         def aggregate_entries(entries, pages, since)
           2.upto(pages) do |page|
             entries += get_entries_from_next_page(since, page)

data/lib/time_log_robot/version.rb

@@ -1,3 +1,3 @@
 module TimeLogRobot
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/test/test_helper.rb

@@ -5,7 +5,6 @@ require 'minitest/autorun'
 require 'minitest/pride'
 require 'minitest/reporters'
 require 'yaml'
-require 'active_support'
 require 'httparty'
 
 Dir[File.expand_path "lib/**/*.rb"].each{|file| require_relative file }

data/test/time_log_robot/toggl/report_test.rb

@@ -0,0 +1,23 @@
+require_relative '../../test_helper'
+
+module TimeLogRobot
+  module Toggl
+    class ReportTest < Minitest::Test
+      def setup
+        @described_class = TimeLogRobot::Toggl::Report
+      end
+
+      def test_since_or_default_with_since
+        since = DateTime.now - 10
+        assert_equal(@described_class.since_or_default(since), since)
+      end
+
+      def test_since_or_default_without_since
+        Date.stub(:today, Date.new(2016,10,18)) do
+          expected_since = Date.new(2016,10,15).to_time
+          assert_equal(@described_class.since_or_default(nil), expected_since)
+        end
+      end
+    end
+  end
+end

data/time_log_robot.gemspec

@@ -26,6 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.5'
 
-  spec.add_runtime_dependency 'activesupport', '~> 4.2', '>= 4.2.6'
-  spec.add_runtime_dependency 'httparty',      '~> 0.13', '>= 0.13.0'
+  spec.add_runtime_dependency 'httparty', '~> 0.13', '>= 0.13.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: time_log_robot
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark J. Lehman
@@ -94,26 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.6
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +126,7 @@ files:
 - ".codeclimate.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -165,6 +146,7 @@ files:
 - lib/time_log_robot/version.rb
 - test/test_helper.rb
 - test/time_log_robot/jira/issue_key_parser_test.rb
+- test/time_log_robot/toggl/report_test.rb
 - time_log_robot.gemspec
 homepage: https://github.com/supremebeing7/time_log_robot
 licenses:
@@ -193,3 +175,4 @@ summary: Automate work time logging
 test_files:
 - test/test_helper.rb
 - test/time_log_robot/jira/issue_key_parser_test.rb
+- test/time_log_robot/toggl/report_test.rb