beeminder 0.2.9 → 0.2.13

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGNjOWExYTVhMzY0ODc3NzRmYTg0ZmM3ZGRiYWI5MzRlZWY0ZTQwZA==
-  data.tar.gz: !binary |-
-    OTBkNmMyMzdmOGM5YTk3ZTJlYjI5ZjIxNmI0MTU2ZWEwYjIxYTFlNA==
+SHA256:
+  metadata.gz: 93a795ea4da67f8f37467e4fba52f1ceaed16612f5ecccc8fb9bd11d0ea1a9ce
+  data.tar.gz: a9e21515c529f820ebf58a2278a3ca36e9b8a44eba59469366820c2f9e21763b
 SHA512:
-  metadata.gz: !binary |-
-    NTcxNTBhNzE5Nzg2ZTUyMWI5OWZkNDZkMjY2OTk0Yjg5MmMwN2Q3MGNmZjhj
-    OTcyODhkOWRjZWZmMGJjNWJhOTg2NjllNjQyYzg2NDMxZWUzZGNhYmFkMjdj
-    ZmI1NjIxODg2ZjA3NzIwYjJhYTA4NmIxMGExMDk2YzY3ZTQ5Njg=
-  data.tar.gz: !binary |-
-    NDI1ZjdlZDhkZTEyMmFiZWU0MTk0NjA1NTY0MjNhMTZmNWE2NGFlOTBhNzVm
-    MWE1YzhjNDhlODFkZTcyNmE1NjA2MzdhODc3NWE2N2UyZmE5NTJhZDU0ZjE1
-    YTYyOTZkZWZhOWZkNDJhMzFhNDA1YmZjMjBlYTc1YmQ5NmM2OGU=
+  metadata.gz: 6269b4af7d7365c6d9e091f2734776af8402dcd5dfd852c19d63d8346417698d7785c526748b3283a40be1db68d7eb3739f588f1f520ec99f37c32382248d5fd
+  data.tar.gz: 9b313b7322ebc9dcc2876c141d6aec6bdf012ab016cdbc4e81361b98dcbba5a92efaa843dfe934f36ea58b3a6bc30378c11888f2dc4616203ec33a7691b84daa

data/beeminder.gemspec

@@ -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', '< 7']
   gem.add_dependency 'chronic', '~> 0.7'
   gem.add_dependency 'json'
   gem.add_dependency 'highline', '~> 1.6'
-  gem.add_dependency 'trollop', '~> 2'
+  gem.add_dependency 'optimist', '~> 3'
   gem.add_dependency 'tzinfo'
 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/goals.rb

@@ -59,6 +59,18 @@ 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
+
+    # @return [true|false] Whether the goal is currently frozen and therefore must be restarted before continuing to accept data.
+    attr_reader :frozen
+
+    # @return [Numeric] Where you are with respect to the yellow brick road (2 or more = above the road, 1 = top lane, -1 = bottom lane, -2 or less = below the road).
+    attr_reader :lane
+
+    # @return [Numeric] Good side of the road. I.e., the side of the road (+1/-1 = above/below) that makes you say “yay”.
+    attr_reader :yaw
     
     def initialize user, name_or_info
       @user = user
@@ -79,7 +91,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 +120,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 +139,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 +199,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 +219,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

@@ -127,6 +127,14 @@ 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.
@@ -140,6 +148,15 @@ module Beeminder
       }
     end
 
+    # 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.
@@ -151,7 +168,7 @@ module Beeminder
       http = Net::HTTP.new(url.host, url.port)
       http.read_timeout = 8640
       http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE # FIXME: actually verify
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER # was VERIFY_NONE for some reason
 
       # FIXME Sanity check for wrong timestamp. Source of bug unknown, but at least we can prevent screwing up someone's graph.
       unless data["timestamp"].nil?
@@ -162,21 +179,25 @@ module Beeminder
       
       json = ""
       http.start do |http|
-        req = case type
-              when :post
-                Net::HTTP::Post.new(url.path)
-                req.set_form_data(data)
-              when :get
-                Net::HTTP::Get.new(url.path + "?" + data.to_query)
-              when :delete
-                Net::HTTP::Delete.new(url.path + "?" + data.to_query)
-              when :put
-                Net::HTTP::Put.new(url.path)
-                req.set_form_data(data)
-              else
-                raise "invalid connection type"
-              end
-        
+        case type
+        when :post
+          req = Net::HTTP::Post.new(url.path)
+          req.set_form_data(data)
+        when :get
+          req = Net::HTTP::Get.new(url.path + "?" + data.to_query)
+        when :delete
+          req = Net::HTTP::Delete.new(url.path + "?" + data.to_query)
+        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
+
         res = http.request(req)
         if not res.is_a? Net::HTTPSuccess
           raise "request failed: #{res.code} / #{res.body}"

data/lib/beeminder/version.rb

@@ -1,3 +1,3 @@
 module Beeminder
-  VERSION = "0.2.9"
+  VERSION = "0.2.13"
 end

data/lib/beeminder.rb

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

metadata

@@ -1,103 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: beeminder
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.13
 platform: ruby
 authors:
 - muflax
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Convenient access to Beeminder's API.
@@ -108,7 +108,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -124,24 +124,23 @@ files:
 homepage: https://github.com/beeminder/beeminder-gem
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: access Beeminder API
 test_files: []