simple_slack 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbccec30429bbfd5960695216b8adc42a7806b50
-  data.tar.gz: f0d5aeb35f7475438a2a7655f1c6559a0e127941
+  metadata.gz: 8e06637e6ea103d483301b1933724dd6ae3987bb
+  data.tar.gz: a0d3bbd05f6562d9e019eade99084d9f84e14447
 SHA512:
-  metadata.gz: 5138a5189c29da34e5e1459301c1956fdfe68c5295544841fc136fba97ae03856cb2c58d839867113fb6599d3b3ebf0ce0e6c2609e5879090b8e3dda96b3c37c
-  data.tar.gz: f9e7a03b114bd39e48367fc5c2d7c2cd745eddf655b4fe0cb07b5684109e06183d9a6f9dd210fd04b03b6292d509fb44e9880e77d5f028b0a03951197b580676
+  metadata.gz: e673cb4c3a13d89c8a0f26433661d8e6ee10c7c71df8b44bde30b717de9e7ac03a8ac5c4a4e867e7e94dd602a7300a201e2466011fa3cbf71877d15a208e2b0c
+  data.tar.gz: 2ef154134887ec1e23b559dd36812fd124bfb114b9bb5822bb0141b9d605f8b05f760ae2d9e782328f70072554063ebd0229bc3b17e91752065470069d561c39

data/lib/simple_slack/toggls/toggl_dailyreport.rb

@@ -4,11 +4,21 @@ module TogglDailyreport
   end
 
   def today_entry_reports
-    reports = []
+    _reports = []
     day_entries.each do |entry|
-      reports << entry_info(entry)
+      _reports << entry_info_hash(entry)
     end
 
+    report_group =
+      _reports.group_by do |report|
+        report.keys.first
+      end
+
+    reports =
+      report_group.map do |discription, entrys|
+        sum_time = entrys.inject(0){|sum, entry| sum + entry.values.first }
+        "#{discription} \(#{(sum_time/60).round(1)}.h\)"
+      end
     reports.join("\n")
   end
 

data/lib/simple_slack/toggls/toggl_entries_parameter.rb

@@ -42,4 +42,20 @@ module TogglEntriesParameter
     "#{tag} #{description} \(#{work_time}\)"
   end
 
+  def entry_info_hash(entry = latest_entry)
+    # 現在作業中（終了時間がない）であれば現在日時を終了時間として取得
+    stop_time_org  = entry["stop"].nil? ? Time.now : Time.parse(entry["stop"])
+
+    start_time = Time.parse(entry["start"]).getlocal("+09:00")
+    stop_time  = stop_time_org.getlocal("+09:00")
+    diff_time  = (stop_time - start_time)/60
+
+    work_time = diff_time.round(2)
+
+    tag = entry["tags"].join(" ") unless entry["tags"].nil?
+    description = entry["description"]
+
+    { "#{tag} #{description}" => work_time }
+  end
+
 end

data/lib/simple_slack/version.rb

@@ -1,3 +1,3 @@
 module SimpleSlack
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_slack
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - toririn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler