idid 0.0.4 → 0.0.5

data/bin/idid

@@ -37,6 +37,6 @@ else
     Idid::Delivery.new(config).email task.to_s
     Idid::Interactive.status "Got it! Let's get some more done!"
   else
-    Idid::Interactive.fail "Shoot! An empty message cannot be send!"
+    Idid::Interactive.fail "Shoot! An empty message cannot be sent!"
   end
-end
+end

data/lib/idid/configuration.rb

@@ -14,8 +14,10 @@ module Idid
       :location => '/usr/bin/exim'
     }
 
-    # Public: Name of the project to post to (e.g. project.idonethis.com)
-    attr_accessor :project
+    # Public: Account type for this user
+    attr_accessor :account_type
+    # Public: Name of the team to post to
+    attr_accessor :team
     # Public: Email address String to use when sending mail.
     attr_accessor :email
     # Public: Email delivery configuration
@@ -24,30 +26,54 @@ module Idid
     # Public: configuration to use with iDoneThis
     #
     # options - Hash with configuration options
-    #           project    - Name of the project to post to (e.g.
-    #                        project.idonethis.com)
     #           email      - Email address to use when sending mail.
     #           delivery   - Email delivery configuration Hash:
     #                        method  - Symbol (:smtp|:sendmail|:exim)
     #                        options - Configuration Hash for the
     #                        delivery method (see:
     #                        https://github.com/mikel/mail).
+    #           team       - Name of the team to post to (optional)
     #
     # Returns a new Idid::Configuration instance
     def initialize(options = {})
       options = read_config.merge options if read_config
-      raise ArgumentError.new "Provide a project to use." unless options['project']
+      raise ArgumentError.new "Provide an account type." unless options['account_type']
+      raise ArgumentError.new "Provide a team to use." if options['account_type'] == 'team' && options['team'].nil?
       raise ArgumentError.new "Provide an email address." unless options['email']
       raise ArgumentError.new "Provide a delivery method." unless options['delivery']
 
-      @project = options['project']
+      @account_type = options['account_type']
+      @team = options['team']
       @email = options['email']
       @delivery = options['delivery']
     end
 
+    # Public: The email address of IDoneThis to send your updates to. This
+    # depends on whether you have a personal or a team account.
+    #
+    # Returns the String with the right email address to use
+    def idonethis_email
+      personal_account? ? "today@idonethis.com" : "#{team}@team.idonethis.com"
+    end
+
+    # Public: Determines if current configuration belongs to a personal account
+    #
+    # Returns boolean
+    def personal_account?
+      account_type == 'personal'
+    end
+
+    # Public: Determines if current configuration belongs to a team account
+    #
+    # Returns boolean
+    def team_account?
+      account_type == 'team'
+    end
+
     def write
       config = {
-        'project' => project,
+        'account_type' => account_type,
+        'team' => team,
         'email'   => email,
         'delivery' => delivery
       }

data/lib/idid/delivery.rb

@@ -24,7 +24,7 @@ module Idid
 
       Mail.deliver do
         from    config.email
-        to      "#{config.project}@team.idonethis.com"
+        to      config.idonethis_email
         subject "I did this"
         body    message
       end

data/lib/idid/interactive.rb

@@ -6,9 +6,17 @@ module Idid
         status "Please take a moment to create a new configuration.."
         config = user_config
         config['delivery'] ||= {}
-        user_config_from_key 'project', "What is the name of your iDoneThis project (look at the url: <project>.idonethis.com)", nil, config
-        user_config_from_key 'email', "What is your associated email address for this iDoneThis project?", nil, config
-        user_config_from_key 'method', "How do you want to send emails to iDoneThis? (smtp, sendmail, exim)", 'smtp', config['delivery']
+
+        user_config_from_key 'account_type', "What kind of iDoneThis account do you have? (personal|team)", 'personal', config
+
+        if config["account_type"] == 'team'
+          user_config_from_key 'team', "What is the name of your iDoneThis team? (check the URL <team>.idonethis.com).", nil, config
+        else
+          config["team"] = nil
+        end
+
+        user_config_from_key 'email', "What is your associated email address for this iDoneThis account?", nil, config
+        user_config_from_key 'method', "How do you want to send emails to iDoneThis? (smtp|sendmail|exim)", 'smtp', config['delivery']
 
         case config['delivery']['method']
         when 'smtp'

data/lib/idid/task.rb

@@ -12,7 +12,6 @@ module Idid
     # Returns an instance of Task
     def initialize(contents, logdate = nil)
       @contents = contents
-      @log = Task.read_log
       @logdate = logdate || Date.today
     end
 
@@ -24,13 +23,13 @@ module Idid
     def save
       logdate = @logdate.strftime '%Y-%m-%d'
 
-      if @log.has_key? logdate
-        @log[logdate].push @contents
+      if log.has_key? logdate
+        log[logdate].push @contents
       else
-        @log[logdate] = [@contents]
+        log[logdate] = [@contents]
       end
 
-      Task.write_log @log
+      Task.write_log log
     end
 
     # Public: Transform Task into a String
@@ -40,6 +39,10 @@ module Idid
       @contents
     end
 
+    def log
+      @log ||= Task.read_log
+    end
+
     # Public: Lists all activities for a given date.
     #
     # date - The String date you wish to show the entries of, in the format
@@ -63,7 +66,7 @@ module Idid
     #
     # Returns the String with the location of the log file
     def self.logfile
-      logfile = File.join ENV['HOME'], '.idid'
+      File.join ENV['HOME'], '.idid'
     end
 
     # Private: Reads the log file into memory.
@@ -87,4 +90,4 @@ module Idid
       File.open(logfile, 'w') { |f| f.write log.to_json }
     end
   end
-end
+end

data/lib/idid/version.rb

@@ -1,3 +1,3 @@
 module Idid
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/idid/configuration_spec.rb

@@ -1,32 +1,77 @@
 require 'spec_helper'
 
 describe Idid::Configuration do
-  subject { Idid::Configuration.new('project' => project, 'email' => email, 'delivery' => delivery) }
+  subject { configuration }
+
+  let(:configuration) { Idid::Configuration.new('team' => team, 'email' => email, 'delivery' => delivery, 'account_type' => account_type) }
   let(:email) { 'foo@example.com' }
-  let(:project) { 'foobar' }
+  let(:team) { 'foobar' }
   let(:delivery) { {:method => :sendmail} }
+  let(:account_type) { 'team' }
 
-  its('project') { should eq project }
-  its('email')   { should eq email   }
+  its('team') { should eq team }
+  its('email') { should eq email }
+  its('account_type') { should eq account_type }
 
   context "when any of the options are missing" do
     before do
       Idid::Configuration.any_instance.stub(:read_config) { nil }
     end
+    let(:account_type) { 'personal' }
 
-    it 'raises ArgumentError if no email option is passed' do
-      expect { Idid::Configuration.new('project' => project, 'delivery' => delivery) }.
-        to raise_error(ArgumentError, /email/)
+    it 'raises ArgumentError if no team option is passed while on a team account' do
+      expect { Idid::Configuration.new('email' => email, 'delivery' => delivery, 'account_type' => 'team') }.
+        to raise_error(ArgumentError, /team/)
     end
 
-    it 'raises ArgumentError if no project option is passed' do
-      expect { Idid::Configuration.new('email' => email, 'delivery' => delivery) }.
-        to raise_error(ArgumentError, /project/)
+    it 'doesnt raises ArgumentError if no team option is passed while on a personal account' do
+      expect { Idid::Configuration.new('email' => email, 'delivery' => delivery, 'account_type' => 'personal') }.
+        to_not raise_error
+    end
+
+    it 'raises ArgumentError if no email option is passed' do
+      expect { Idid::Configuration.new('team' => team, 'delivery' => delivery, 'account_type' => account_type) }.
+        to raise_error(ArgumentError, /email/)
     end
 
     it 'raises ArgumentError if no delivery option is passed' do
-      expect { Idid::Configuration.new('email' => email, 'project' => project) }.
+      expect { Idid::Configuration.new('email' => email, 'team' => team, 'account_type' => account_type) }.
         to raise_error(ArgumentError, /delivery/)
     end
+
+    it 'raises ArgumentError if no account type is passed' do
+      expect { Idid::Configuration.new('email' => email, 'team' => team, 'delivery' => delivery) }.
+        to raise_error(ArgumentError, /account type/)
+    end
+  end
+
+  describe "#idonethis_email" do
+    subject { configuration.idonethis_email }
+
+    context "team account" do
+      let(:account_type) { 'team' }
+      let(:team) { 'foobar' }
+      it { should eq 'foobar@team.idonethis.com' }
+    end
+
+    context "personal account" do
+      let(:account_type) { 'personal' }
+      it { should eq 'today@idonethis.com' }
+    end
   end
+
+  describe "#personal_account?" do
+    subject { configuration.personal_account? }
+
+    let(:account_type) { 'personal' }
+    it { should be_true }
+  end
+
+  describe "#team_account?" do
+    subject { configuration.team_account? }
+
+    let(:account_type) { 'team' }
+    it { should be_true }
+  end
+
 end

data/spec/idid/delivery_spec.rb

@@ -7,9 +7,10 @@ describe Idid::Delivery do
   let(:delivery) { Idid::Delivery.new config }
   let(:config) do
     Idid::Configuration.new(
-      'project' => 'foo',
+      'team' => 'foo',
       'email' => 'john@example.com',
-      'delivery' => { 'method' => :test }
+      'delivery' => { 'method' => :test },
+      'account_type' => 'team'
     )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idid
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake