beeminder 0.1.3 → 0.1.4

data/beeminder.gemspec

@@ -16,5 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
+  gem.add_dependency 'json'
   gem.add_dependency 'highline', '~> 1.6'
+  gem.add_dependency 'trollop', '~> 2'
 end

data/bin/beemind

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # coding: utf-8
 
+require 'highline/import'
+require 'trollop'
 require 'yaml'
 
 # load library
@@ -14,30 +16,42 @@ else
   require 'beeminder'
 end
 
-config = "#{Dir.home}/.beeminderrc"
-if not File.exists? config
+usage = "usage: beemind goal value [comment]"
+opts = Trollop::options do
+  banner usage
+
+  opt :config, "Path to config.", :type => :string, :default => "~/.beeminderrc"
+  opt :list,   "List all available goals."
+end
+
+Trollop::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]
+
+if not File.exists? opts[:config]
   # create config
-  require 'highline/import'
-  yaml = {
+  auth = {
     "account" => ask("Beeminder account:"),
     "token"   => ask("Auth token:")
   }
-  File.open(config, "w+") {|f| YAML.dump yaml, f}
-  File.chmod 0600, config
-  puts "Written config to '#{config}.'"
+  File.open(opts[:config], "w+") {|f| YAML.dump yaml, f}
+  File.chmod 0600, opts[:config]
+  puts "Written config to '#{opts[:config]}.'"
 end
 
 # load config
-yaml = YAML.load File.open(config)
+auth = YAML.load File.open(opts[:config])
 
 # login
-bee = Beeminder::User.new yaml["account"], yaml["token"]
-
-if not (2..3).include? ARGV.size
-  puts "usage: beemind goal value [comment]"
-  exit 1
+bee = Beeminder::User.new auth["account"], auth["token"]
+
+if opts[:list]
+  # list all available goals
+  puts "available goals:"
+  goals = bee.goals.sort_by{|g| g.slug}.each do |goal|
+    puts "  #{goal.slug} (#{goal.title})"
+  end
+else
+  bee.send goal, value, comment || ""
 end
-
-goal, value, comment = ARGV
-
-bee.send goal, value, comment || ""

data/lib/beeminder/user.rb

@@ -54,7 +54,7 @@ module Beeminder
     # @param comment [String] Optional comment.
     def send name, value, comment=""
       goal = self.goal name
-      dp = Beeminder::Datapoint.new value: value, comment: comment
+      dp = Beeminder::Datapoint.new :value => value, :comment => comment
       goal.add dp
     end
     
@@ -108,7 +108,8 @@ 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
+      
       json = ""
       http.start do |http|
         req = case type

data/lib/beeminder/version.rb

@@ -1,3 +1,3 @@
 module Beeminder
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beeminder
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,6 +11,22 @@ bindir: bin
 cert_chain: []
 date: 2012-09-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -27,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Convenient access to Beeminder's API.
 email:
 - mail@muflax.com
@@ -61,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2536722299943442593
+      hash: 867077506270084543
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -70,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2536722299943442593
+      hash: 867077506270084543
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23