beeminder 0.2.10 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe9446419e3fc9249d45e27dfdb7e93eaa2fd293
-  data.tar.gz: 940d2b2b7a75f34c276aef94a89d76b2f2624adc
+  metadata.gz: d48e75546e891468169cba69c260a9b183a02856
+  data.tar.gz: a8bec82ae557bdd48009dd6b8ae96e4bc19f977a
 SHA512:
-  metadata.gz: 375ad660e200645afa73bbf18df8b3717b7eb7dc945d7c9985a20bf695239d68b0819acab666bb0ff3bbac8e305dde35a47d714b292144ef6f0700283f4c3be9
-  data.tar.gz: 620545b90de4a56f0fd4cf785763dfc6a6bd2b0baaf18b6ddaa788461b246d725d011001da4e8907b5653a51cba237331a09f169ead72ceeb12dba4e74562668
+  metadata.gz: f4dfdd266db0b8ed2b2a0e7aa8583e497719792351c2d7cb7aeb5fbfbccae9e7beb37b20204dea9ff3a4748b83069bd2b015311c3b0d49e18abb67d4944d1206
+  data.tar.gz: 80a2fd645e8762ba2d8f241628db3dffc2b42ec72a102e2505a75eaaf6b012dc929dc33402f9524929a217caa2d7968fb9a906e50c8cba8c31fbf5b1b6f6770c

data/beeminder.gemspec

@@ -6,8 +6,8 @@ require 'beeminder/version'
 Gem::Specification.new do |gem|
   gem.name          = "beeminder"
   gem.version       = Beeminder::VERSION
-  gem.authors       = ["muflax"]
-  gem.email         = ["mail@muflax.com"]
+  gem.authors       = ["muflax", "bsoule"]
+  gem.email         = ["support@beeminder.com"]
   gem.description   = "Convenient access to Beeminder's API."
   gem.summary       = "access Beeminder API"
   gem.homepage      = "https://github.com/beeminder/beeminder-gem"
@@ -16,10 +16,10 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'activesupport', ['>= 3.2', '< 5']
+  gem.add_dependency 'activesupport', ['>= 3.2', '< 6']
   gem.add_dependency 'chronic', '~> 0.7'
-  gem.add_dependency 'json'
+  gem.add_dependency 'json', '~> 1'
   gem.add_dependency 'highline', '~> 1.6'
-  gem.add_dependency 'trollop', '~> 2'
-  gem.add_dependency 'tzinfo'
+  gem.add_dependency 'optimist', '~> 3'
+  gem.add_dependency 'tzinfo', '~> 1.2' 
 end

data/bin/beemind

@@ -3,7 +3,7 @@
 
 require 'chronic'
 require 'highline/import'
-require 'trollop'
+require 'optimist'
 require 'yaml'
 
 # load library
@@ -18,7 +18,7 @@ else
 end
 
 usage = "usage: beemind goal value [comment]"
-opts = Trollop::options do
+opts = Optimist::options do
   banner usage
 
   opt :config, "Path to config.", :type => :string, :default => "~/.beeminderrc"
@@ -27,7 +27,7 @@ opts = Trollop::options do
   opt :date,   "Set a manual date. Uses Chronic syntax.", :type => :string, :default => "now"
 end
 
-Trollop::die usage if not (2..3).include?(ARGV.size) and not opts[:list]
+Optimist::die usage if not (2..3).include?(ARGV.size) and not opts[:list]
 goal, value, comment = ARGV unless opts[:list]
 
 opts[:config] = File.expand_path opts[:config]
@@ -66,7 +66,7 @@ if opts[:list]
   end
 else
   date = Chronic.parse(opts[:date], :context => :past)
-  Trollop::die "invalid date" if date.nil?
+  Optimist::die "invalid date" if date.nil?
 
   g = bee.goal goal
   dp = Beeminder::Datapoint.new :timestamp => date, 

data/lib/beeminder.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 
+require 'active_support'
 require 'active_support/core_ext'
 require 'date'
 require 'json'

data/lib/beeminder/goals.rb

@@ -59,6 +59,9 @@ module Beeminder
 
     # @return [Beeminder::User] User that owns this goal.
     attr_reader :user
+
+    # @return [Array<Integer, Float, Float>] All road settings over time
+    attr_accessor :roadall
     
     def initialize user, name_or_info
       @user = user
@@ -79,7 +82,7 @@ module Beeminder
     # Reload data from Beeminder.
     def reload
       info = @user.get "users/me/goals/#{@slug}.json"
-      parse_info info
+      _parse_info info
     end
 
     # List of datapoints.
@@ -108,8 +111,9 @@ module Beeminder
         "secret"     => @secret || false,
         "datapublic" => @datapublic || false,
       }
+      data['roadall'] = @roadall if @roadall
 
-      @user.put "users/me/goals/#{@slug}.json", data
+      @user.put_document "users/me/goals/#{@slug}.json", data
     end
 
     # Send new road setting to Beeminder.
@@ -126,6 +130,20 @@ module Beeminder
         
       @user.post "users/me/goals/#{@slug}/dial_road.json", dials
     end
+
+    # Schedule a break.
+    # Adds two new entries to `roadall` reflecting the break.
+    # Use #update to actually update the goal.
+    #
+    # @param start_time [Time] when to start the break -- must be after the akrasia horizon
+    # @param end_time [Time] when to end the break
+    # @param rate [Float] the slope of the road during the break
+    def schedule_break start_time, end_time, rate = 0.0
+      check_break start_time, end_time
+
+      roadall.insert(-2, [start_time.to_i, nil, roadall.last.last])
+      roadall.insert(-2, [end_time.to_i, nil, rate])
+    end
     
     # Add one or more datapoints to the goal.
     #
@@ -172,6 +190,14 @@ module Beeminder
 
     private
 
+    def check_break start_time, end_time
+      akrasia_horizon = user.akrasia_horizon
+      fail ArgumentError, "break start can't be before the akrasia horizon (#{akrasia_horizon})" \
+          if start_time < akrasia_horizon
+      fail ArgumentError, 'break must start before it ends' \
+          unless end_time > start_time
+    end
+
     def _parse_info info
       # set variables
       info.each do |k,v|
@@ -184,6 +210,9 @@ module Beeminder
       @losedate   = DateTime.strptime(@losedate.to_s,   '%s').in_time_zone(@user.timezone) unless @losedate.nil?
       @updated_at = DateTime.strptime(@updated_at.to_s, '%s').in_time_zone(@user.timezone)
       @curdate    = DateTime.strptime(@curdate.to_s,    '%s').in_time_zone(@user.timezone) unless @curdate.nil?
+
+      # reported data is sometimes malformed like this
+      roadall.last[0] = nil if !roadall.nil? && roadall.last[0] == 0
     end
   end
 

data/lib/beeminder/user.rb

@@ -19,13 +19,13 @@ module Beeminder
 
     # @return [true|false] Enforce user timezone for all passed times? Should be true unless you know what you're doing. (Default: `true`.)
     attr_accessor :enforce_timezone
-
+    
     def initialize token, opts={}
       opts = {
         :auth_type => :personal,
         :enforce_timezone => true,
       }.merge(opts)
-
+      
       @token            = token
       @auth_type        = opts[:auth_type]
       @enforce_timezone = opts[:enforce_timezone]
@@ -39,7 +39,7 @@ module Beeminder
         else
           raise ArgumentError, "Auth type not supported, must be :personal or :oauth."
         end
-
+      
       info = get "users/me.json"
 
       @name       = info["username"]
@@ -47,13 +47,13 @@ module Beeminder
       @updated_at = DateTime.strptime(info["updated_at"].to_s, '%s').in_time_zone(@timezone)
     end
 
-    # Enforce timezone for all passed times?
+    # Enforce timezone for all passed times? 
     #
     # @return [true|false]
     def enforce_timezone?
       !!@enforce_timezone
     end
-
+    
     # List of goals.
     #
     # @param filter [Symbol] filter goals, can be `:all` (default), `:frontburner` or `:backburner`
@@ -87,7 +87,7 @@ module Beeminder
       dp = Beeminder::Datapoint.new :value => value, :comment => comment
       goal.add dp
     end
-
+    
     # Create new goal.
     #
     # @param opts [Hash] Goal options.
@@ -127,26 +127,43 @@ module Beeminder
       _connection :put, cmd, data
     end
 
+    # Send PUT request with a JSON document to API.
+    #
+    # @param cmd [String] the API command, like `users/#{user.name}.json`
+    # @param data [Hash] data to send
+    def put_document cmd, data = {}
+      _connection :put_json, cmd, data
+    end
+
     # Converts time object to one with user's timezone.
     #
     # @param time [Date|DateTime|Time] Time to convert.
     # @return [Time] Converted time.
     def convert_to_timezone time
       Time.use_zone(@timezone){
-
+      
       time = time.to_time unless time.is_a?(Time)
       Time.local(time.year, time.month, time.day, time.hour, time.min, time.sec)
-
+      
       }
     end
 
-    private
+    # Returns the current akrasia horizon.
+    #
+    # @return [Time] The first instant changes can be made for.
+    def akrasia_horizon
+      Time.use_zone(@timezone) do
+        -8.days.ago.beginning_of_day
+      end
+    end
 
+    private
+    
     # Establish HTTPS connection to API.
     def _connection type, cmd, data
       api  = "https://www.beeminder.com/api/v1/#{cmd}"
       data = {@token_type => @token}.merge(data)
-
+      
       url = URI.parse(api)
       http = Net::HTTP.new(url.host, url.port)
       http.read_timeout = 8640
@@ -159,7 +176,7 @@ module Beeminder
           raise ArgumentError, "invalid timestamp: #{data["timestamp"]}"
         end
       end
-
+      
       json = ""
       http.start do |http|
         case type
@@ -173,6 +190,10 @@ module Beeminder
         when :put
           req = Net::HTTP::Put.new(url.path)
           req.set_form_data(data)
+        when :put_json
+          req = Net::HTTP::Put.new(url.path)
+          req.body = data.to_json
+          req.content_type = 'application/json'
         else
           raise "invalid connection type"
         end

data/lib/beeminder/version.rb

@@ -1,3 +1,3 @@
 module Beeminder
-  VERSION = "0.2.10"
+  VERSION = "0.2.12"
 end

metadata

@@ -1,34 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: beeminder
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.12
 platform: ruby
 authors:
 - muflax
+- bsoule
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDLDCCAhSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA8MQ0wCwYDVQQDDARtYWls
-  MRYwFAYKCZImiZPyLGQBGRYGbXVmbGF4MRMwEQYKCZImiZPyLGQBGRYDY29tMB4X
-  DTE0MDMxNzA1NTUwM1oXDTE1MDMxNzA1NTUwM1owPDENMAsGA1UEAwwEbWFpbDEW
-  MBQGCgmSJomT8ixkARkWBm11ZmxheDETMBEGCgmSJomT8ixkARkWA2NvbTCCASIw
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMBwn+ZDlWYfoEevtvoQBKK+NBFA
-  U9iKN5Aa4g51ZjiFUtoasYeTVUvqKmkRDM+tFTjlTNRCMtFKZy+Fbw+Q2+JALBnk
-  isyJmRCxoWLxUds/XT40I0m+mtwP5etKr7g01lE3gsIM8644iEBGw41pG7F8nm2w
-  dxcs78uGx/Y89vH4xlP5utdq4lChCo60+jQWUBNdnRlrFoBerUrdEUWlj7HhOQSl
-  coJqx3UHhPw1e97CxC4r4IEO4vfNwMr3Uxxcv/idcQwDi5thDwtzjG3u4xwzL3xS
-  HSvktDccLmeF9hsWUGlmee87oQGqZvZTmRmLmpcpzsNxFcVJxGK72VfbsjUCAwEA
-  AaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEEiWHZRn5hp
-  8ho98JIewpJitn3DMA0GCSqGSIb3DQEBBQUAA4IBAQCFr4wcczJG+SkvzaP+LPaB
-  PyDf6lhOYB5BbxteVc3qoK1bxOhMKRlzl9k5pzKbd8FCAokhojoPvUFkZuB7E2RB
-  VC1cDAdYr7s8CCNnUjH1nk3esXRyXGWBBTOlAc96SmbukEV+qVdf2CWnRRHxDtyZ
-  Ov/8JRksnmBUhPzUgAxsEZaX3eSLv/cJGjnOeEgNKA52FmY6S1/MNkLN743AXFfR
-  njhyNen7eGs/8Og1krIw4crmFCVawKI0LXuWTff/3zb8d9SZXZePbzPv+q0IG3ek
-  lmwpPc3Bdi/+i0PzT69bN5W+96Yp2JUDPmQXTG2QGwWDqEQF/BnHtlVQ/1w649V+
-  -----END CERTIFICATE-----
-date: 2014-04-21 00:00:00.000000000 Z
+cert_chain: []
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,7 +20,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +30,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -68,16 +49,16 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -93,36 +74,36 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 description: Convenient access to Beeminder's API.
 email:
-- mail@muflax.com
+- support@beeminder.com
 executables:
 - beemind
 extensions: []
@@ -160,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: access Beeminder API

checksums.yaml.gz.sig

@@ -1,2 +0,0 @@
-�do�K�湷M����$�V�qD/
�
-
�\oQ��4deu��νbJ'��+t�7M;"�`*��[5�

metadata.gz.sig

@@ -1 +0,0 @@
-
��mj<���Q]0H�+_���V��<�N]n�+���S��