balboa 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c25acee3579ab0c156d12ce5e438e813d1547d8
-  data.tar.gz: 1476c5b8e2c9a49b7f5e5d2d5591888234e3b5f0
+  metadata.gz: 5afd6ed3afeeb7f8b8df77c2eac12c2f0c331056
+  data.tar.gz: f61c6b46fe1b9cfdf11ad6517c7576d672fae7d1
 SHA512:
-  metadata.gz: 3fcfe0ee354b9c9996907fb1d529e72d6910127b9abd812dbbb486259ea35f1ed21835843febaf6b626113b3dc95fda6fb0ec55b9bbf425459f69152c718dc4b
-  data.tar.gz: 387295753dda02919638b846b917bb4e9a63992ae178f74e1ff6b184628d1224f2ac50d3507e6badb22673f4a0784cbdca1bdcbdd4d79504c16be5dfc48f105e
+  metadata.gz: c42fb6f86aefaf243229ce60e8192c24f4970ed2892754fef303f775a268f9a56dec8ecb49061b37ea561f079c2c74bc7fb14fc446a1a226ab0e75dbd03c8159
+  data.tar.gz: 392b518101ad26e4be02afd360eace9dc9980f8e546609df9d9ca7bb1b59c9f2b7b6acb14df75b5df12159331b4b1ade2e4619e1a8128cf9a27143d091367594

data/.gitignore

@@ -7,4 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
-.balboa
+.balboa.yml

data/bin/balboa

@@ -2,20 +2,24 @@
 # frozen_string_literal: true
 
 require_relative '../lib/balboa'
+require_relative '../lib/balboa/cli/parser_builder'
+require_relative '../lib/balboa/interactor/interactor_builder'
 
-defaults = if File.exist?(Balboa::CONFIG_FILE)
+require 'highline/import'
+
+options = if File.exist?(Balboa::CONFIG_FILE)
   YAML.load_file(Balboa::CONFIG_FILE)
 else
-  Balboa::CLI::Defaults.prompt
+  Balboa::CLI::Defaults.prompt(HighLine)
 end
 
-options = Balboa::CLI::Options.parse(ARGV, defaults)
+Balboa::CLI::ParserBuilder.create(ARGV, options).parse!
 
 raw_interactor = Balboa::Interactor::InteractorBuilder.create(options)
 interactor = Balboa::Interactor::InteractorWrapper.new(raw_interactor)
 
 app_last = Balboa::CLI::Command::LastCommand.new(interactor)
-app_punch = Balboa::CLI::Command::PunchCommand.new(interactor)
+app_punch = Balboa::CLI::Command::PunchCommand.new(interactor, HighLine)
 app_reset = Balboa::CLI::Command::ResetCommand.new
 app_star_wars = Balboa::CLI::Command::StarWarsCommand.new
 

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'holidays'
-require 'highline/import'
+require_relative '../../punch_date'
 
 module Balboa
   module CLI
     module Command
       class PunchCommand
-        def initialize(interactor)
+        def initialize(interactor, cli)
           @interactor = interactor
+          @cli = cli
         end
 
         def execute
@@ -25,7 +25,7 @@ module Balboa
           yesterday = Date.today - 1
 
           (last_punch_date..yesterday).map do |date|
-            PunchDate.new(date)
+            PunchDate.new(date, @cli)
           end
         end
 
@@ -40,49 +40,6 @@ module Balboa
         def last_punch_date
           Date.parse(@interactor.last) + 1
         end
-
-        class PunchDate
-          def initialize(date)
-            @date = date
-            @holiday = Hash(Holidays.on(@date, :br).first)
-          end
-
-          def punchable?
-            if weekend?
-              false
-            elsif holiday?
-              ask_for_punch
-            else
-              true
-            end
-          end
-
-          def to_s
-            @date.to_s
-          end
-
-          def strftime(format)
-            @date.strftime(format)
-          end
-
-          private
-
-          def ask_for_punch
-            HighLine.agree(" #{holiday_name}. Punch? (y|n) ")
-          end
-
-          def holiday_name
-            @holiday[:name]
-          end
-
-          def holiday?
-            !!@holiday
-          end
-
-          def weekend?
-            @date.sunday? || @date.saturday?
-          end
-        end
       end
     end
   end

data/lib/balboa/cli/defaults.rb

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
 require 'yaml'
-require 'highline'
 
 module Balboa
   module CLI
     class Defaults
-      def self.prompt
-        new.prompt
+      def self.prompt(*args)
+        new(*args).prompt
       end
 
-      def initialize
-        @config = {}
-        @cli = HighLine.new
+      def initialize(cli, config={})
+        @config = config
+        @cli = cli
       end
 
       def prompt

data/lib/balboa/punch_date.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'holidays'
+
+module Balboa
+  class PunchDate
+    def initialize(date, cli)
+      @date = date
+      @cli = cli
+      @holiday = Hash(Holidays.on(date, :br).first)
+    end
+
+    def punchable?
+      if weekend?
+        false
+      elsif holiday?
+        ask_for_punch
+      else
+        true
+      end
+    end
+
+    def to_s
+      @date.to_s
+    end
+
+    def strftime(format)
+      @date.strftime(format)
+    end
+
+    private
+
+    def ask_for_punch
+      @cli.agree(" #{holiday_name}. Punch? (y|n) ")
+    end
+
+    def holiday_name
+      @holiday[:name]
+    end
+
+    def holiday?
+      !@holiday.empty?
+    end
+
+    def weekend?
+      @date.sunday? || @date.saturday?
+    end
+  end
+end

data/lib/balboa/version.rb

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

data/lib/balboa.rb

@@ -6,13 +6,11 @@ require_relative 'balboa/host'
 
 require_relative 'balboa/interactor/capybara_interactor'
 require_relative 'balboa/interactor/interactor_wrapper'
-require_relative 'balboa/interactor/interactor_builder'
 require_relative 'balboa/interactor/command/fetch_last_punch_command'
 require_relative 'balboa/interactor/command/fill_punch_command'
 require_relative 'balboa/interactor/command/login_command'
 
 require_relative 'balboa/cli/application'
-require_relative 'balboa/cli/options'
 require_relative 'balboa/cli/defaults'
 require_relative 'balboa/cli/command/last_command'
 require_relative 'balboa/cli/command/punch_command'

data/spec/balboa/cli/defaults_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'highline'
+
+describe Balboa::CLI::Defaults do
+end

data/spec/balboa/interactor/interactor_wrapper_spec.rb

@@ -22,4 +22,13 @@ describe Balboa::Interactor::InteractorWrapper do
 
     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

data/spec/balboa/punch_date_spec.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'highline/import'
+
+describe Balboa::PunchDate do
+  it 'responds to to_s' do
+    date = Date.new(2011,1,1)
+    punch_date = described_class.new(date, nil)
+
+    expect(punch_date.to_s).to eq('2011-01-01')
+  end
+
+  it 'responds to strftime' do
+    date = Date.new(2011,1,1)
+    punch_date = described_class.new(date, nil)
+
+    expect(punch_date.strftime('%d/%m/%Y')).to eq('01/01/2011')
+  end
+
+  context 'punchable' do
+    it 'returns false on satudays' do
+      date = Date.new(2011,1,1)
+      punch_date = described_class.new(date, nil)
+
+      expect(punch_date.punchable?).to be false
+    end
+
+    it 'returns false on sundays' do
+      date = Date.new(2011,1,2)
+      punch_date = described_class.new(date, nil)
+
+      expect(punch_date.punchable?).to be false
+    end
+
+    it 'returns true on a week day that is not a holiday' do
+      date = Date.new(2011,1,3)
+      punch_date = described_class.new(date, nil)
+
+      expect(punch_date.punchable?).to be true
+    end
+
+    it 'returns true if user says yes on holidays' do
+      input = StringIO.new("no\n")
+      output = StringIO.new
+      cli = HighLine.new(input, output)
+
+      date = Date.new(2011,4,21)
+      punch_date = described_class.new(date, cli)
+
+      expect(punch_date.punchable?).to be false
+    end
+
+    it 'returns false if user says no on holidays' 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)
+
+      expect(punch_date.punchable?).to be true
+    end
+  end
+end

data/spec/balboa_spec.rb

@@ -10,4 +10,8 @@ describe Balboa do
   it 'has a target host' do
     expect(Balboa::HOST).not_to be nil
   end
+
+  it 'has a config file' do
+    expect(Balboa::CONFIG_FILE).not_to be nil
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: balboa
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Waldyr de Souza
@@ -91,13 +91,11 @@ files:
 - features/support/env.rb
 - lib/balboa.rb
 - lib/balboa/cli/application.rb
-- lib/balboa/cli/command/help_command.rb
 - lib/balboa/cli/command/last_command.rb
 - lib/balboa/cli/command/punch_command.rb
 - lib/balboa/cli/command/reset_command.rb
 - lib/balboa/cli/command/star_wars_command.rb
 - lib/balboa/cli/defaults.rb
-- lib/balboa/cli/options.rb
 - lib/balboa/cli/parser_builder.rb
 - lib/balboa/config_file.rb
 - lib/balboa/host.rb
@@ -107,10 +105,13 @@ files:
 - 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/version.rb
 - spec/balboa/capybara_interactor_spec.rb
 - spec/balboa/cli/application_spec.rb
+- spec/balboa/cli/defaults_spec.rb
 - spec/balboa/interactor/interactor_wrapper_spec.rb
+- spec/balboa/punch_date_spec.rb
 - spec/balboa_spec.rb
 - spec/spec_helper.rb
 homepage: 

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../version'
-
-module Balboa
-  module CLI
-    module Command
-      class HelpCommand
-        def execute
-          $stdout.puts help 
-        end
-
-        private
-
-        def help
-        end
-
-        def quote
-          "`Life's not about how hard of a hit you can give...'"
-        end
-      end
-    end
-  end
-end

data/lib/balboa/cli/options.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'parser_builder'
-
-module Balboa
-  module CLI
-    class Options
-      def self.parse(*args)
-        new(*args).parse
-      rescue OptionParser::InvalidOption => error
-        $stderr.puts "Error: #{error}"
-        exit
-      end
-
-      def initialize(argv=[], config={})
-        @config = config
-        @parser = Balboa::CLI::ParserBuilder.create(argv, config)
-      end
-
-      def parse
-        @parser.parse!
-        @config
-      end
-    end
-  end
-end