balboa 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef19d875f6ac656065f2f7d7ff0becccafc84eae
-  data.tar.gz: 9dfd4d4c08f7fc5275b3ee1fdbeb2abeb8827e3e
+  metadata.gz: bae7fa2a0ed778439952c80e904bfc4d1b20bb86
+  data.tar.gz: cf581ff2e9e518d84fddbb4a68ce3b719c3cff7e
 SHA512:
-  metadata.gz: bcb71570d31f5e1b71c1fbbe2ae1136b721ba680cad14ea3307c0df1479b40cc7d6cf227944e27558ead12e45a3a79ca4eddb3d028500853dae01b4186cfff3f
-  data.tar.gz: e7c323ea423915735d1bef6799b539c6e8ea5452142793c21125103d9cf53e28c8dd46a9e2ff1d6076bf8067a8d899b45419936b2b7770c1b6978b6a796697bb
+  metadata.gz: c479bc46f03d0bdbfec9e4bd451bc14f9b438632828a020272900c295d7f1c9afe0c78379584abae4a9f42b02ef6efa3f971bddb740f7b10368510c703903ec9
+  data.tar.gz: b15e044b0c286edad6da3c934b7b1e9298ff067bbbfef26286871bd45b63d5fc345f248f33277a43b54a852bf0ba646480ef14f341b1f842527ee77248f76c9a

data/.travis.yml

@@ -6,21 +6,7 @@ rvm:
   - 2.3.0
   - 2.2
   - 2.1
-  - 2.0
 matrix:
-  include:
-    - rvm: jruby
-      env: JRUBY_OPTS='--2.0 --server -Xcompile.invokedynamic=false'
-    - rvm: jruby-head
-      env: JRUBY_OPTS='--server -Xcompile.invokedynamic=false'
-  allow_failures:
-    - rvm: jruby
-    - rvm: jruby-head
-    - rvm: rbx-2
-    - rvm: ruby-head
-    - rvm: 1.9.3
-    - rvm: 1.9.2
-    - rvm: 1.8.7
   fast_finish: true
 branches:
   only:

data/Gemfile

@@ -4,14 +4,16 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'reek',         '~> 4.2.0'
-gem 'rspec',        '~> 3.0'
-gem 'cucumber',     '~> 2.0'
-gem 'rubocop',      '~> 0.41.1'
-gem 'mutant-rspec', '~> 0.8.8'
+group :development do
+  gem 'reek',         '~> 4.2.0'
+  gem 'rspec',        '~> 3.0'
+  gem 'cucumber',     '~> 2.0'
+  gem 'rubocop',      '~> 0.41.1'
+  gem 'mutant-rspec', '~> 0.8.8'
+  gem 'rake',         '~> 11.2.2'
+  gem 'rack',         '~> 1.0.0'
 
-gem 'rake',         '~> 10.0'
-
-gem 'capybara',     '~> 2.7.1'
-gem 'poltergeist',  '~> 1.10.0'
-gem 'phantomjs',    '~> 2.1.1.0', require: 'phantomjs/poltergeist'
+  gem 'capybara',     '~> 2.7.1'
+  gem 'poltergeist',  '~> 1.10.0'
+  gem 'phantomjs',    '~> 2.1.1.0', require: 'phantomjs/poltergeist'
+end

data/bin/balboa

@@ -7,16 +7,19 @@ require_relative '../lib/balboa/interactor/interactor_builder'
 
 require 'highline/import'
 
-options = if File.exist?(Balboa::CONFIG_FILE)
-            YAML.load_file(Balboa::CONFIG_FILE)
-          else
-            Balboa::CLI::Defaults.prompt(HighLine)
-          end
+options = Balboa::CLI::Parser.parse(ARGV)
 
-Balboa::CLI::Parser.parse(ARGV, options)
+defaults = if options['skip_defaults']
+             {}
+           elsif File.exist?(Balboa::CONFIG_FILE)
+             YAML.load_file(Balboa::CONFIG_FILE)
+           else
+             Balboa::CLI::Defaults.prompt(HighLine)
+           end
 
-raw_interactor = Balboa::Interactor::InteractorBuilder.create(options)
-interactor = Balboa::Interactor::InteractorWrapper.new(raw_interactor)
+options = defaults.merge(options)
+
+interactor = Balboa::Interactor::InteractorBuilder.create(options)
 
 app_last = Balboa::CLI::Command::LastCommand.new(interactor)
 app_punch = Balboa::CLI::Command::PunchCommand.new(interactor, HighLine)
@@ -31,7 +34,7 @@ app.add_command(:reset, app_reset)
 app.add_command(:star_wars, app_star_wars)
 
 begin
-  app.execute
+  $stdout.puts(app.execute)
 rescue Balboa::CLI::Application::CommandNotFound
   $stdout.puts("\nCommand Not Found!")
   $stdout.puts("\nRun `balboa -h' to check available commands and options.")

data/lib/balboa.rb

@@ -5,7 +5,6 @@ require_relative 'balboa/config_file'
 require_relative 'balboa/host'
 
 require_relative 'balboa/interactor/capybara_interactor'
-require_relative 'balboa/interactor/interactor_wrapper'
 require_relative 'balboa/interactor/command/fetch_last_punch_command'
 require_relative 'balboa/interactor/command/fill_punch_command'
 require_relative 'balboa/interactor/command/login_command'

data/lib/balboa/cli/command/last_command.rb

@@ -9,7 +9,7 @@ module Balboa
         end
 
         def execute
-          $stdout.puts("\n#{@interactor.last}")
+          "\n#{@interactor.last}"
         end
       end
     end

data/lib/balboa/cli/command/punch_command.rb

@@ -14,28 +14,35 @@ module Balboa
         def execute
           punch_dates.reject! { |date| skip_date?(date) }
 
-          punch_dates.each do |date|
-            $stdout.print("\n#{date.strftime('%d/%m/%Y')}")
-            @interactor.punch(date)
-          end
+          punch_dates.each { |date| @interactor.punch(date) }
+
+          command_output
         end
 
         private
 
         def punch_dates
-          yesterday = Date.today - 1
-
-          (last_punch_date..yesterday).map do |date|
-            PunchDate.new(date, @cli)
+          @punch_dates ||= (last_punch_date..(Date.today - 1)).map do |date|
+            Balboa::PunchDate.new(date, @cli)
           end
         end
 
-        def skip_date?(date)
-          !date.punchable? || skips_include?(date)
+        def command_output
+          punch_dates.map do |date|
+            "\n#{date.strftime('%d/%m/%Y')}"
+          end.join
+        end
+
+        def skip_date?(punch_date)
+          !punch_date.punchable? || skips_include?(punch_date)
+        end
+
+        def skips_include?(punch_date)
+          skipped_dates.include?(punch_date.to_date)
         end
 
-        def skips_include?(date)
-          @interactor.options['skips'].include?(date)
+        def skipped_dates
+          @interactor.options['skips']
         end
 
         def last_punch_date

data/lib/balboa/cli/command/reset_command.rb

@@ -7,10 +7,12 @@ module Balboa
         def execute
           File.delete(Balboa::CONFIG_FILE)
 
-          $stdout.puts(message)
+          command_output
         end
 
-        def message
+        private
+
+        def command_output
           "\nBalboa restored to initial settings!"
         end
       end

data/lib/balboa/cli/defaults.rb

@@ -11,8 +11,8 @@ module Balboa
         new(*args).prompt
       end
 
-      def initialize(cli, config = {})
-        @config = config
+      def initialize(cli)
+        @config = {}
         @cli = cli
       end
 

data/lib/balboa/cli/parser.rb

@@ -10,16 +10,16 @@ module Balboa
         new(*args).parse
       end
 
-      def initialize(argv, default_config)
-        @config = default_config
+      def initialize(argv)
+        @config = {}
         @argv = argv
         @parser = OptionParser.new
       end
 
       def parse
         configure_parser
-
         @parser.parse!(@argv)
+        @config
       end
 
       private
@@ -60,6 +60,7 @@ module Balboa
 
         @parser.on('-c', '--config \'FILE\'', message) do |file|
           @config.merge!(YAML.load_file(file))
+          @config['skip_defaults'] = true
         end
       end
 

data/lib/balboa/config_file.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Balboa
-  CONFIG_FILE = '.balboa.yml'.freeze
+  CONFIG_FILE = File.join(Dir.home, '.balboa.yml').freeze
 end

data/lib/balboa/interactor/command/fill_punch_command.rb

@@ -13,8 +13,9 @@ module Balboa
 
         PunchCreationError = Class.new(RuntimeError)
 
-        def initialize(options)
-          @options = options
+        def initialize(schedule, project)
+          @schedule = schedule
+          @project = project
         end
 
         def execute(date)
@@ -34,18 +35,18 @@ module Balboa
         end
 
         def fill_first_shift(date)
-          fill_form(date, @options['start_at'], @options['lunch_at'])
+          fill_form(date, @schedule.start_at, @schedule.lunch_at)
         end
 
         def fill_second_shift(date)
-          fill_form(date, @options['restart_at'], @options['leave_at'])
+          fill_form(date, @schedule.restart_at, @schedule.leave_at)
         end
 
         def fill_form(date, start_time, finish_time)
           fill_in 'punch[from_time]', with: TIME_TEMPLATE % start_time
           fill_in 'punch[to_time]', with: TIME_TEMPLATE % finish_time
           fill_in 'punch[when_day]', with: date.to_s
-          select @options['project'], from: 'punch[project_id]'
+          select @project, from: 'punch[project_id]'
 
           confirm
         end

data/lib/balboa/interactor/command/login_command.rb

@@ -12,8 +12,9 @@ module Balboa
 
         LoginFailure = Class.new(RuntimeError)
 
-        def initialize(options)
-          @options = options
+        def initialize(email, password)
+          @email = email
+          @password = password
         end
 
         def execute
@@ -31,8 +32,8 @@ module Balboa
         end
 
         def fill_form
-          fill_in 'E-mail', with: @options['email']
-          fill_in 'Password', with: @options['password']
+          fill_in 'E-mail', with: @email
+          fill_in 'Password', with: @password
         end
 
         def confirm

data/lib/balboa/interactor/interactor_builder.rb

@@ -4,6 +4,7 @@ require_relative 'capybara_interactor'
 require_relative 'command/fetch_last_punch_command'
 require_relative 'command/fill_punch_command'
 require_relative 'command/login_command'
+require_relative '../schedule'
 
 module Balboa
   module Interactor
@@ -14,11 +15,11 @@ module Balboa
 
       def initialize(options)
         @options = options
-        @interactor = Balboa::Interactor::CapybaraInteractor.new(options)
+        @interactor = CapybaraInteractor.new(options)
       end
 
       def create
-        last_punch = Balboa::Interactor::Command::FetchLastPunchCommand.new
+        last_punch = Command::FetchLastPunchCommand.new
 
         @interactor.tap do |itr|
           itr.add_command(:punch, fill_punch)
@@ -29,12 +30,19 @@ module Balboa
 
       private
 
+      def schedule
+        Balboa::Schedule.new(@options['start_at'],
+                             @options['lunch_at'],
+                             @options['restart_at'],
+                             @options['leave_at'])
+      end
+
       def fill_punch
-        Balboa::Interactor::Command::FillPunchCommand.new(@options)
+        Command::FillPunchCommand.new(schedule, @options['project'])
       end
 
       def login
-        Balboa::Interactor::Command::LoginCommand.new(@options)
+        Command::LoginCommand.new(@options['email'], @options['password'])
       end
     end
   end

data/lib/balboa/punch_date.rb

@@ -28,6 +28,10 @@ module Balboa
       @date.strftime(format)
     end
 
+    def to_date
+      @date
+    end
+
     private
 
     def ask_for_punch

data/lib/balboa/schedule.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Balboa
+  class Schedule
+    attr_reader :start_at, :lunch_at, :restart_at, :leave_at
+
+    def initialize(start_at, lunch_at, restart_at, leave_at)
+      @start_at = start_at
+      @lunch_at = lunch_at
+      @restart_at = restart_at
+      @leave_at = leave_at
+    end
+  end
+end

data/lib/balboa/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Balboa
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

data/spec/balboa/cli/command/last_command_spec.rb

@@ -6,8 +6,8 @@ describe Balboa::CLI::Command::LastCommand do
   it 'prints out the result of interactor last method' do
     interactor = double('itr', last: 42)
 
-    expect(STDOUT).to receive(:puts).with("\n42")
+    output = described_class.new(interactor).execute
 
-    described_class.new(interactor).execute
+    expect(output).to eq("\n42")
   end
 end

data/spec/balboa/cli/command/punch_command_spec.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'highline'
+
+require_relative '../../../../lib/balboa/punch_date'
+
+describe Balboa::CLI::Command::PunchCommand do
+  class InteractorFaker
+    def initialize(last, skips = [])
+      @last = last
+
+      @options = {
+        'skips' => skips
+      }
+    end
+
+    attr_reader :last, :options
+
+    def punch(date)
+    end
+  end
+
+  it 'raises when skips is not an array' do
+    interactor = InteractorFaker.new('bad date')
+
+    command = described_class.new(interactor, nil)
+
+    expect { command.execute }.to raise_error(ArgumentError)
+  end
+
+  it 'returns all punched dates' do
+    today = Date.new(2015, 8, 15)
+    last_punch_date = today - 7
+
+    allow(Date).to receive(:today).and_return(today)
+    interactor = InteractorFaker.new(last_punch_date.to_s)
+
+    command = described_class.new(interactor, nil)
+
+    punched_dates = [
+      "\n10/08/2015",
+      '11/08/2015',
+      '12/08/2015',
+      '13/08/2015',
+      '14/08/2015'
+    ]
+    expect(command.execute).to eq(punched_dates.join("\n"))
+  end
+
+  it 'returns all punched dates except for the skipped ones' do
+    today = Date.new(2015, 8, 15)
+    last_punch_date = today - 7
+    skips = [Date.new(2015, 8, 12), Date.new(2015, 8, 14)]
+
+    allow(Date).to receive(:today).and_return(today)
+    interactor = InteractorFaker.new(last_punch_date.to_s, skips)
+
+    command = described_class.new(interactor, nil)
+
+    punched_dates = [
+      "\n10/08/2015",
+      '11/08/2015',
+      '13/08/2015'
+    ]
+    expect(command.execute).to eq(punched_dates.join("\n"))
+  end
+
+  it 'returns all punched dates except for the skipped ones' do
+    today = Date.new(2015, 8, 15)
+    last_punch_date = today - 7
+    skips = [Date.new(2015, 8, 12), Date.new(2015, 8, 14)]
+
+    allow(Date).to receive(:today).and_return(today)
+    interactor = InteractorFaker.new(last_punch_date.to_s, skips)
+
+    command = described_class.new(interactor, nil)
+
+    punched_dates = [
+      "\n10/08/2015",
+      '11/08/2015',
+      '13/08/2015'
+    ]
+    expect(command.execute).to eq(punched_dates.join("\n"))
+  end
+
+  it 'returns nothing when last punch date is recent' do
+    today = Date.new(2015, 8, 15)
+    last_punch_date = today
+    skips = [Date.new(2015, 8, 12), Date.new(2015, 8, 14)]
+
+    allow(Date).to receive(:today).and_return(today)
+    interactor = InteractorFaker.new(last_punch_date.to_s, skips)
+
+    command = described_class.new(interactor, nil)
+
+    expect(command.execute).to eq('')
+  end
+
+  context 'on holidays' do
+    it 'skips date when user input no' do
+      today = Date.new(2015, 9, 10)
+      last_punch_date = today - 7
+
+      input = StringIO.new('no\n')
+      output = StringIO.new
+      cli = HighLine.new(input, output)
+
+      allow(Date).to receive(:today).and_return(today)
+      interactor = InteractorFaker.new(last_punch_date.to_s)
+
+      command = described_class.new(interactor, cli)
+
+      punched_dates = [
+        "\n04/09/2015",
+        '08/09/2015',
+        '09/09/2015'
+      ]
+      expect(command.execute).to eq(punched_dates.join("\n"))
+    end
+
+    it 'returns date when user input yes' do
+      today = Date.new(2015, 9, 10)
+      last_punch_date = today - 7
+
+      input = StringIO.new('yes\n')
+      output = StringIO.new
+      cli = HighLine.new(input, output)
+
+      allow(Date).to receive(:today).and_return(today)
+      interactor = InteractorFaker.new(last_punch_date.to_s)
+
+      command = described_class.new(interactor, cli)
+
+      punched_dates = [
+        "\n04/09/2015",
+        '07/09/2015',
+        '08/09/2015',
+        '09/09/2015'
+      ]
+      expect(command.execute).to eq(punched_dates.join("\n"))
+    end
+  end
+end

data/spec/balboa/cli/command/reset_command_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe Balboa::CLI::Command::ResetCommand do
   it 'deletes the .balboa.yml file' do
-    expect(File).to receive(:delete).with('.balboa.yml')
+    expect(File).to receive(:delete).with(Balboa::CONFIG_FILE)
 
     described_class.new.execute
   end
@@ -12,10 +12,8 @@ describe Balboa::CLI::Command::ResetCommand do
   it 'prints out a success message' do
     success_message = "\nBalboa restored to initial settings!"
 
-    allow(File).to receive(:delete).with('.balboa.yml')
+    allow(File).to receive(:delete).with(Balboa::CONFIG_FILE)
 
-    expect(STDOUT).to receive(:puts).with(success_message)
-
-    described_class.new.execute
+    expect(described_class.new.execute).to eq(success_message)
   end
 end

data/spec/balboa/cli/defaults_spec.rb

@@ -4,4 +4,184 @@ require 'spec_helper'
 require 'highline'
 
 describe Balboa::CLI::Defaults do
+  it 'welcomes the user' do
+    input = StringIO.new
+    output = StringIO.new
+    cli = HighLine.new(input, output)
+
+    input << "john@doe.com\n"
+    input << "john@doe.com\n"
+    input << "Doe Company\n"
+    input << "\n"
+    input << "\n"
+    input << "\n"
+    input << "\n"
+    input.rewind
+
+    described_class.prompt(cli)
+
+    expect(output.string).to include('First run. Please type your settings!')
+  end
+
+  it 'does not show input password' do
+    input = StringIO.new
+    output = StringIO.new
+    cli = HighLine.new(input, output)
+
+    password = 'motherlode'
+
+    input << "john@doe.com\n"
+    input << "#{password}\n"
+    input << "Doe Company\n"
+    input << "\n"
+    input << "\n"
+    input << "\n"
+    input << "\n"
+    input.rewind
+
+    described_class.prompt(cli)
+
+    expect(output.string).not_to include(password)
+  end
+
+  it 'prompts for attributes and fill some with default value' do
+    input = StringIO.new
+    output = StringIO.new
+    cli = HighLine.new(input, output)
+
+    input << "john@doe.com\n"
+    input << "john@doe.com\n"
+    input << "Doe Company\n"
+    input << "\n"
+    input << "\n"
+    input << "\n"
+    input << "\n"
+    input.rewind
+
+    config = described_class.prompt(cli)
+
+    expect(config).to eq(
+      'email'      => 'john@doe.com',
+      'password'   => 'john@doe.com',
+      'project'    => 'Doe Company',
+      'start_at'   => '8',
+      'lunch_at'   => '12',
+      'restart_at' => '13',
+      'leave_at'   => '17',
+      'skips'      => []
+    )
+  end
+
+  it 'prompts for password but removes if empty' do
+    input = StringIO.new
+    output = StringIO.new
+    cli = HighLine.new(input, output)
+
+    input << "john@doe.com\n"
+    input << "\n"
+    input << "Doe Company\n"
+    input << "\n"
+    input << "\n"
+    input << "\n"
+    input << "\n"
+    input.rewind
+
+    config = described_class.prompt(cli)
+
+    expect(config).to eq(
+      'email'      => 'john@doe.com',
+      'project'    => 'Doe Company',
+      'start_at'   => '8',
+      'lunch_at'   => '12',
+      'restart_at' => '13',
+      'leave_at'   => '17',
+      'skips'      => []
+    )
+  end
+
+  it 'prompts for attributes and place them in the right spot' do
+    input = StringIO.new
+    output = StringIO.new
+    cli = HighLine.new(input, output)
+
+    input << "john@doe.com\n"
+    input << "john@doe.com\n"
+    input << "Doe Company\n"
+    input << "13\n"
+    input << "14\n"
+    input << "15\n"
+    input << "16\n"
+    input.rewind
+
+    config = described_class.prompt(cli)
+
+    expect(config).to eq(
+      'email'      => 'john@doe.com',
+      'password'   => 'john@doe.com',
+      'project'    => 'Doe Company',
+      'start_at'   => '13',
+      'lunch_at'   => '14',
+      'restart_at' => '15',
+      'leave_at'   => '16',
+      'skips'      => []
+    )
+  end
+
+  it 'prompts for attributes and place them in the right spot' do
+    input = StringIO.new
+    output = StringIO.new
+    cli = HighLine.new(input, output)
+
+    input << "john@doe.com\n"
+    input << "john@doe.com\n"
+    input << "Doe Company\n"
+    input << "13\n"
+    input << "14\n"
+    input << "15\n"
+    input << "16\n"
+    input.rewind
+
+    file = double('file')
+    open_args = [Balboa::CONFIG_FILE, 'w']
+    config = {
+      'email'      => 'john@doe.com',
+      'password'   => 'john@doe.com',
+      'project'    => 'Doe Company',
+      'start_at'   => '13',
+      'lunch_at'   => '14',
+      'restart_at' => '15',
+      'leave_at'   => '16',
+      'skips'      => []
+    }
+
+    expect(File).to receive(:open).with(*open_args).and_yield(file)
+    expect(file).to receive(:write).with(config.to_yaml)
+
+    described_class.prompt(cli)
+  end
+
+  it 'prompts for schedule and adapt on each input' do
+    input = StringIO.new
+    output = StringIO.new
+    cli = HighLine.new(input, output)
+
+    input << "john@doe.com\n"
+    input << "john@doe.com\n"
+    input << "Doe Company\n"
+    input << "1\n"
+    input << "2\n"
+    input << "4\n"
+    input << "8\n"
+    input.rewind
+
+    described_class.prompt(cli)
+
+    expectations = [
+      'First shift: |8|',
+      'Lunch: |5|',
+      'Second shift: |3|',
+      'Leave: |11|'
+    ]
+    expect(output.string).to include(*expectations)
+  end
 end

data/spec/balboa/cli/parser_spec.rb

@@ -6,111 +6,94 @@ require_relative '../../../lib/balboa/cli/parser'
 
 describe Balboa::CLI::Parser do
   it 'parses a password option into a hash of configurations' do
-    config = {}
     argv = ['-p', 'test']
-
-    described_class.parse(argv, config)
+    config = described_class.parse(argv)
 
     expect(config).to eq('password' => 'test')
   end
 
   it 'parses a password full option into a hash of configurations' do
-    config = {}
     argv = ['--password', 'test']
-
-    described_class.parse(argv, config)
+    config = described_class.parse(argv)
 
     expect(config).to eq('password' => 'test')
   end
 
   it 'parses a project option into a hash of configurations' do
-    config = {}
     argv = ['-w', 'test']
-
-    described_class.parse(argv, config)
+    config = described_class.parse(argv)
 
     expect(config).to eq('project' => 'test')
   end
 
   it 'parses a project full option into a hash of configurations' do
-    config = {}
     argv = ['--project', 'test']
-
-    described_class.parse(argv, config)
+    config = described_class.parse(argv)
 
     expect(config).to eq('project' => 'test')
   end
 
   it 'parses a email option into a hash of configurations' do
-    config = {}
     argv = ['-e', 'test']
-
-    described_class.parse(argv, config)
+    config = described_class.parse(argv)
 
     expect(config).to eq('email' => 'test')
   end
 
   it 'parses a email full option into a hash of configurations' do
-    config = {}
     argv = ['--email', 'test']
-
-    described_class.parse(argv, config)
+    config = described_class.parse(argv)
 
     expect(config).to eq('email' => 'test')
   end
 
   it 'parses a config option into a hash of configurations' do
-    config = {}
     argv = ['-c', 'spec/fixtures/file.yml']
-
-    described_class.parse(argv, config)
+    config = described_class.parse(argv)
 
     expectation = {
-      'email'      => 'email',
-      'password'   => 'password',
-      'project'    => 'project',
-      'start_at'   => '8',
-      'lunch_at'   => '12',
-      'restart_at' => '13',
-      'leave_at'   => '17',
-      'skips'      => []
+      'email'         => 'email',
+      'password'      => 'password',
+      'project'       => 'project',
+      'start_at'      => '8',
+      'lunch_at'      => '12',
+      'restart_at'    => '13',
+      'skip_defaults' => true,
+      'leave_at'      => '17',
+      'skips'         => []
     }
     expect(config).to eq(expectation)
   end
 
   it 'parses a config full option into a hash of configurations' do
-    config = {}
     argv = ['--config', 'spec/fixtures/file.yml']
-
-    described_class.parse(argv, config)
+    config = described_class.parse(argv)
 
     expectation = {
-      'email'      => 'email',
-      'password'   => 'password',
-      'project'    => 'project',
-      'start_at'   => '8',
-      'lunch_at'   => '12',
-      'restart_at' => '13',
-      'leave_at'   => '17',
-      'skips'      => []
+      'email'         => 'email',
+      'password'      => 'password',
+      'project'       => 'project',
+      'start_at'      => '8',
+      'lunch_at'      => '12',
+      'restart_at'    => '13',
+      'skip_defaults' => true,
+      'leave_at'      => '17',
+      'skips'         => []
     }
     expect(config).to eq(expectation)
   end
 
   it 'raises ENOENT on invalid path to file' do
-    config = {}
     argv = ['-c', 'wrong path to file']
 
-    parser = described_class.new(argv, config)
+    parser = described_class.new(argv)
 
     expect { parser.parse }.to raise_error(Errno::ENOENT)
   end
 
   it 'parses a skipped date option into a hash of configurations' do
-    config = {}
     argv = ['-s', '13/06/1992,15/06/2002']
-
-    described_class.parse(argv, config)
+    config = described_class.parse(argv)
 
     expectation = {
       'skips' => [
@@ -121,19 +104,15 @@ describe Balboa::CLI::Parser do
   end
 
   it 'raises argument error in case of a wrong date format' do
-    config = {}
     argv = ['-s', 'test']
-
-    parser = described_class.new(argv, config)
+    parser = described_class.new(argv)
 
     expect { parser.parse }.to raise_error(ArgumentError)
   end
 
   it 'parses a skipped date full option into a hash of configurations' do
-    config = {}
     argv = ['--skip', '12/06/1992,12/06/1992']
-
-    described_class.parse(argv, config)
+    config = described_class.parse(argv)
 
     expectation = {
       'skips' => [
@@ -144,27 +123,20 @@ describe Balboa::CLI::Parser do
   end
 
   it 'parses options that override or fulfill config' do
-    config = {
-      'password' => '1',
-      'project'  => '3'
-    }
     argv = ['-p', '3', '-e', '2', '-w', '1']
-
-    described_class.parse(argv, config)
+    config = described_class.parse(argv)
 
     expectation = {
       'password' => '3',
       'email'    => '2',
       'project'  => '1'
     }
-
     expect(config).to eq(expectation)
   end
 
   it 'raises on invalid arguments' do
-    config = {}
     argv = ['-z']
-    parser = described_class.new(argv, config)
+    parser = described_class.new(argv)
 
     expect { parser.parse }.to raise_error(OptionParser::InvalidOption)
   end

data/spec/balboa/punch_date_spec.rb

@@ -11,6 +11,13 @@ describe Balboa::PunchDate do
     expect(punch_date.to_s).to eq('2011-01-01')
   end
 
+  it 'responds to to_date' do
+    date = Date.new(2011, 1, 1)
+    punch_date = described_class.new(date, nil)
+
+    expect(punch_date.to_date).to eq(date)
+  end
+
   it 'responds to strftime' do
     date = Date.new(2011, 1, 1)
     punch_date = described_class.new(date, nil)
@@ -61,5 +68,18 @@ describe Balboa::PunchDate do
 
       expect(punch_date.punchable?).to be true
     end
+
+    it 'displays the holiday name' do
+      input = StringIO.new("yes\n")
+      output = StringIO.new
+      cli = HighLine.new(input, output)
+
+      date = Date.new(2011, 4, 21)
+      punch_date = described_class.new(date, cli)
+
+      punch_date.punchable?
+
+      expect(output.string).to match(/Tiradentes/)
+    end
   end
 end

data/spec/balboa/schedule_spec.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Balboa::Schedule do
+  it 'saves all shift attributes' do
+    schedule = described_class.new(8, 12, 13, 17)
+
+    expect(schedule).not_to be_nil
+  end
+
+  it 'responds to start_at' do
+    schedule = described_class.new(8, 12, 13, 17)
+
+    expect(schedule.start_at).to eq(8)
+  end
+
+  it 'responds to lunch_at' do
+    schedule = described_class.new(8, 12, 13, 17)
+
+    expect(schedule.lunch_at).to eq(12)
+  end
+
+  it 'responds to restart_at' do
+    schedule = described_class.new(8, 12, 13, 17)
+
+    expect(schedule.restart_at).to eq(13)
+  end
+
+  it 'responds to leave_at' do
+    schedule = described_class.new(8, 12, 13, 17)
+
+    expect(schedule.leave_at).to eq(17)
+  end
+end

data/spec/spec_helper.rb

@@ -2,3 +2,8 @@
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'balboa'
+require 'timeout'
+
+RSpec.configure do |c|
+  c.around(:each) { |ex| Timeout.timeout(3, &ex) }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balboa
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Waldyr de Souza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -104,19 +104,20 @@ files:
 - lib/balboa/interactor/command/fill_punch_command.rb
 - lib/balboa/interactor/command/login_command.rb
 - lib/balboa/interactor/interactor_builder.rb
-- lib/balboa/interactor/interactor_wrapper.rb
 - lib/balboa/punch_date.rb
+- lib/balboa/schedule.rb
 - lib/balboa/version.rb
-- spec/balboa/capybara_interactor_spec.rb
 - spec/balboa/cli/application_spec.rb
 - spec/balboa/cli/command/last_command_spec.rb
+- spec/balboa/cli/command/punch_command_spec.rb
 - spec/balboa/cli/command/reset_command_spec.rb
 - spec/balboa/cli/command/star_wars_command_spec.rb
 - spec/balboa/cli/defaults_spec.rb
 - spec/balboa/cli/parser_spec.rb
+- spec/balboa/interactor/capybara_interactor_spec.rb
 - spec/balboa/interactor/interactor_builder_spec.rb
-- spec/balboa/interactor/interactor_wrapper_spec.rb
 - spec/balboa/punch_date_spec.rb
+- spec/balboa/schedule_spec.rb
 - spec/balboa_spec.rb
 - spec/fixtures/file.yml
 - spec/spec_helper.rb

data/lib/balboa/interactor/interactor_wrapper.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Balboa
-  module Interactor
-    class InteractorWrapper
-      def initialize(interactor)
-        @interactor = interactor
-      end
-
-      def punch(date)
-        @interactor.punch(date)
-      end
-
-      def last
-        @interactor.last
-      end
-
-      def options
-        @interactor.options
-      end
-    end
-  end
-end

data/spec/balboa/interactor/interactor_wrapper_spec.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Balboa::Interactor::InteractorWrapper do
-  it 'forwards punch call to its dependency' do
-    today = Date.today
-
-    interactor = double
-    allow(interactor).to receive(:punch).with(today)
-
-    described_class.new(interactor).punch(today)
-
-    expect(interactor).to have_received(:punch).with(today).once
-  end
-
-  it 'forwards last call to its dependency' do
-    interactor = double
-    allow(interactor).to receive(:last)
-
-    described_class.new(interactor).last
-
-    expect(interactor).to have_received(:last).once
-  end
-
-  it 'forwards options call to its dependency' do
-    interactor = double
-    allow(interactor).to receive(:options)
-
-    described_class.new(interactor).options
-
-    expect(interactor).to have_received(:options).once
-  end
-end