balboa 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bb21929ddabfd4eb5c0527b926497445980fa65
-  data.tar.gz: 08f0051c4cb708b38c3ab89f328983b94ff0b040
+  metadata.gz: 259c76600d7bcd513743de8ac654c905536d05f5
+  data.tar.gz: 62811d033eb6aa3b0be11386c68a7fa835ea545a
 SHA512:
-  metadata.gz: 4f59a7d0bc7c9154eb470c328e3cfd4f4b744fd50015ca91e917a620ac0597ccd837b0918dc1ab16d1bb7120e142339b98ccc0dffbf945f3d37e7a87c0446932
-  data.tar.gz: 3559ea61cc181c8ca6678626a659ca25d808fdc0414716fe40bc9daea637d93cab7dd0af968ebaccbba58e91cef4445d77ea95b301e4e31def81ed43d5852c60
+  metadata.gz: b098e9dde480d645e69e893dbdadece15f69113a3b2de85bf501d4e5de4c92218ac337d6978db2d4e2e63f5a14ea6f8fb0db09aad7de4be13d2ef35ff74d6b99
+  data.tar.gz: e3cce93de5d628acec25cc1d241ac7c0ccd3430716b8e5482f6a6526da70a1a8decd9cef562ac14f790caf74dd20c9292c0ec0ce6deaeb44cecc1dcb50692502

data/.gitignore

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

data/Rakefile

@@ -34,7 +34,7 @@ namespace :test do
         --include lib\
         --require balboa\
         --use rspec\
-        --since master\
+        --since master^\
         --jobs 4 'Balboa*'
     EOS
     system command

data/balboa.gemspec

@@ -22,4 +22,7 @@ Gem::Specification.new do |s|
   s.default_executable = 'balboa'
 
   s.required_ruby_version = '>= 2.0'
+
+  s.add_runtime_dependency 'capybara',    '~> 2.7.1'
+  s.add_runtime_dependency 'phantomjs',   '~> 2.1.1.0'
 end

data/bin/balboa

@@ -3,28 +3,24 @@
 
 require_relative '../lib/balboa'
 
-command = ARGV.shift || 'make_punch'
+command = ARGV.shift || :help
 app = Balboa::CLI::Application.new(command)
 options = Balboa::CLI::Options.parse(ARGV)
 
-crawler = Balboa::Interactor::CapybaraInteractor.new(options)
+raw_interactor = Balboa::Interactor::CapybaraInteractor.new
 
-crawler_last_punch = Balboa::Interactor::Command::LastPunchCommand.new
-crawler_make_punch = Balboa::Interactor::Command::MakePunchCommand.new(options)
-crawler_login      = Balboa::Interactor::Command::LoginCommand.new(options)
+Balboa::Interactor::InteractorBuilder.create(raw_interactor, options)
 
-crawler.add_command :last_punch, crawler_last_punch
-crawler.add_command :make_punch, crawler_make_punch
-crawler.add_command :login,      crawler_login
+interactor = Balboa::Interactor::InteractorWrapper.new(raw_interactor)
 
-interactor = Balboa::Interactor::InteractorWrapper.new(crawler)
-
-app_last_punch = Balboa::CLI::Command::LastPunchCommand.new(interactor)
-app_make_punch = Balboa::CLI::Command::MakePunchCommand.new(interactor, options['holidays'])
+app_last = Balboa::CLI::Command::LastCommand.new(interactor)
+app_punch = Balboa::CLI::Command::PunchCommand.new(interactor, options['holidays'])
+app_help = Balboa::CLI::Command::HelpCommand.new
 app_star_wars = Balboa::CLI::Command::StarWarsCommand.new
 
-app.add_command :last_punch, app_last_punch
-app.add_command :make_punch, app_make_punch
-app.add_command :star_wars,  app_star_wars
+app.add_command(:last, app_last)
+app.add_command(:punch, app_punch)
+app.add_command(:help, app_help)
+app.add_command(:star_wars, app_star_wars)
 
-puts app.execute
+app.execute

data/lib/balboa/cli/application.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'options'
-
 module Balboa
   module CLI
     class Application

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require_relative '../../version'
+
+module Balboa
+  module CLI
+    module Command
+      class HelpCommand
+        def execute
+          $stdout.puts help 
+        end
+
+        private
+
+        def help
+          [
+            "░░░░░▄▄███████████████▄▄░░░░  BALBOA #{Balboa::VERSION}",
+            "░░▄██████████████████████▄░░",
+            "░█████████▀███████▀████████░",
+            "█████████▀▀█▀█░░▀██▄██▄████░  Usage: balboa [command] [options]",
+            "░████████▄▄█░▀▀▄▄█░░▀░████░░",
+            "░███████▀░░░▄▄▄▄░░░▄▄▄███░░░  Commands:",
+            "▀███████░░▄▀▀██▀░░█▄░▄▀███░░    last         Fetch last punch date",
+            "░██████▀░░█░██▀▀░░████░██░░░    punch        Punch up to yesterday",
+            "████████░▄░░▀▀░░░░▀▄░▀▀█░░░░    help         HERBERT, COME TO MY RESCUE",
+            "█▀██████▀░▄░░▄░░░░░░█░░█░░░░",
+            "▀▄████▄▀░░░▀▀░░▀░▄░░▀░░░█░░░  Options:",
+            "▄██████▀▄░░░░░░░░░██▄▄▄░█░░░    balboa punch -c FILE       Override config from .balboa",
+            "███████░█░░░░░░░░█▀▄▄▄█░░█░░    balboa punch -p PASSWORD   Override password from .balboa",
+            "░██████░░█░░░░░░░░░▀░░░░░░▀▄",
+            "▀▄█████░░░▀▄░░░░░░░░░░░░░░░█  Examples:",
+            "░░░███▀░░░░░░▀░░░░▄░░░░░░▄█░    balboa",
+            "░░░▄▀░░░░░░░░░▀▄░░░▀▀▀▀▀█▀░░    balboa punch",
+            "░▀░░░░░░░░░░░░░░░▀░░░░░░▀▄░░",
+            "░░░░░░░░░░░░░░░░░░░░░░░▄░█▀▄  #{quote}"
+          ].join("\n")
+        end
+
+        def quote
+          "`Life's not about how hard of a hit you can give...'"
+        end
+      end
+    end
+  end
+end

data/lib/balboa/cli/command/{last_punch_command.rb → last_command.rb}

@@ -3,13 +3,13 @@
 module Balboa
   module CLI
     module Command
-      class LastPunchCommand
+      class LastCommand
         def initialize(interactor)
           @interactor = interactor
         end
 
         def execute
-          @interactor.last_punch
+          $stdout.puts(@interactor.last)
         end
       end
     end

data/lib/balboa/cli/command/{make_punch_command.rb → punch_command.rb}

@@ -3,7 +3,7 @@
 module Balboa
   module CLI
     module Command
-      class MakePunchCommand
+      class PunchCommand
         def initialize(interactor, holidays)
           @interactor = interactor
           @holidays = holidays.uniq.map { |holiday| Date.parse(holiday) }
@@ -11,13 +11,15 @@ module Balboa
 
         def execute
           punch_dates.each do |date|
-            if date.saturday? || date.sunday?
-              $stdout.puts "#{date} # WEEKEND"
-            elsif holiday?(date)
-              $stdout.puts "#{date} # HOLIDAY"
+            $stdout.print(date.strftime("%d/%m/%Y"))
+
+            if date.saturday? || date.sunday? || holiday?(date)
+              $stdout.print(" # SKIPPED")
             else
               @interactor.punch(date)
             end
+
+            $stdout.print("\n")
           end
         end
 
@@ -34,7 +36,7 @@ module Balboa
         end
 
         def last_punch_date
-          Date.parse(@interactor.last_punch) + 1
+          Date.parse(@interactor.last) + 1
         end
       end
     end

data/lib/balboa/cli/options.rb

@@ -6,8 +6,8 @@ require 'yaml'
 module Balboa
   module CLI
     class Options
-      ERROR_EXIT_CODE   = 1
-      BALBOA_FILE       = '.balboa'.freeze
+      ERROR_EXIT_CODE = 1
+      BALBOA_FILE = '.balboa'.freeze
 
       MissingOptionError = Class.new(RuntimeError)
 
@@ -50,8 +50,8 @@ module Balboa
       end
 
       def load_params
-        @parser.on('-d', '--data PARAMS') do |data|
-          @config.merge!(data)
+        @parser.on('-p', '--password PASSWORD') do |password|
+          @config.merge!('password' => password)
         end
       end
     end

data/lib/balboa/host.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Balboa
+  HOST = 'http://punchclock.cm42.io/'.freeze
+end

data/lib/balboa/interactor/capybara_interactor.rb

@@ -3,28 +3,43 @@
 module Balboa
   module Interactor
     class CapybaraInteractor
-      def initialize(options)
-        @options = options
-        @commands = {}
+
+      CommandNotFound = Class.new(RuntimeError)
+      LoginCommandNotFound = Class.new(CommandNotFound)
+
+      def initialize
+        @commands = Hash.new { fail CommandNotFound }
+        @signed_in = false
       end
       
       def add_command(key, command)
         @commands[key.to_s] = command
       end
 
-      def last_punch
-        login
-        @commands['last_punch'].execute
+      def last
+        login unless signed_in?
+
+        @commands['last'].execute
       end
 
       def punch(date)
-        @commands['make_punch'].execute(date)
+        login unless signed_in?
+
+        @commands['punch'].execute(date)
       end
 
       private
 
+      attr_accessor :signed_in
+
+      alias_method :signed_in?, :signed_in
+
       def login
         @commands['login'].execute
+
+        @signed_in = true
+      rescue CommandNotFound
+        raise LoginCommandNotFound
       end
     end
   end

data/lib/balboa/interactor/command/{last_punch_command.rb → fetch_last_punch_command.rb}

@@ -5,7 +5,7 @@ require 'capybara/dsl'
 module Balboa
   module Interactor
     module Command
-      class LastPunchCommand
+      class FetchLastPunchCommand
         include Capybara::DSL
 
         def execute

data/lib/balboa/interactor/command/{make_punch_command.rb → fill_punch_command.rb}

@@ -5,7 +5,7 @@ require 'capybara/dsl'
 module Balboa
   module Interactor
     module Command
-      class MakePunchCommand
+      class FillPunchCommand
         include Capybara::DSL
 
         def initialize(options)

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

@@ -8,6 +8,10 @@ module Balboa
       class LoginCommand
         include Capybara::DSL
 
+        SuccessMessage = 'Login efetuado com sucesso!'.freeze
+
+        LoginFailure = Class.new(RuntimeError)
+
         def initialize(options)
           @options = options
         end
@@ -33,6 +37,9 @@ module Balboa
 
         def confirm
           click_button 'Sign in'
+          find('p', text: SuccessMessage)
+        rescue Capybara::ElementNotFound
+          raise LoginFailure
         end
       end
     end

data/lib/balboa/interactor/interactor_builder.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative 'capybara_interactor'
+require_relative 'command/fetch_last_punch_command'
+require_relative 'command/fill_punch_command'
+require_relative 'command/login_command'
+
+module Balboa
+  module Interactor
+    class InteractorBuilder
+      def self.create(*args)
+        new(*args).create
+      end
+
+      def initialize(interactor, options)
+        @interactor = interactor
+        @options = options
+      end
+      
+      def create
+        last_punch = Balboa::Interactor::Command::FetchLastPunchCommand.new
+
+        @interactor.tap do |itr|
+          itr.add_command(:punch, fill_punch)
+          itr.add_command(:last, last_punch)
+          itr.add_command(:login, login)
+        end
+      end
+
+      private
+
+      def fill_punch
+        Balboa::Interactor::Command::FillPunchCommand.new(@options)
+      end
+
+      def login
+        Balboa::Interactor::Command::LoginCommand.new(@options)
+      end
+    end
+  end
+end

data/lib/balboa/interactor/interactor_wrapper.rb

@@ -11,8 +11,8 @@ module Balboa
         @interactor.punch(date)
       end
 
-      def last_punch
-        @interactor.last_punch
+      def last
+        @interactor.last
       end
     end
   end

data/lib/balboa/version.rb

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

data/lib/balboa.rb

@@ -1,16 +1,20 @@
 # frozen_string_literal: true
 
 require_relative 'balboa/version'
+require_relative 'balboa/host'
 
 require_relative 'balboa/interactor/capybara_interactor'
 require_relative 'balboa/interactor/interactor_wrapper'
-require_relative 'balboa/interactor/command/last_punch_command'
-require_relative 'balboa/interactor/command/make_punch_command'
+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/command/last_punch_command'
-require_relative 'balboa/cli/command/make_punch_command'
+require_relative 'balboa/cli/options'
+require_relative 'balboa/cli/command/last_command'
+require_relative 'balboa/cli/command/punch_command'
+require_relative 'balboa/cli/command/help_command'
 require_relative 'balboa/cli/command/star_wars_command'
 
 require 'phantomjs'
@@ -21,4 +25,4 @@ Capybara.register_driver :poltergeist do |app|
 end
 Capybara.default_driver = :poltergeist
 Capybara.run_server = false
-Capybara.app_host = 'http://punchclock.cm42.io/'
+Capybara.app_host = Balboa::HOST

data/spec/balboa/cli/application_spec.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Balboa::CLI::Application do
+  it 'stores commands to execute later' do
+    app = described_class.new('cmd')
+    command = double('command', execute: true)
+
+    app.add_command('cmd', command)
+
+    expect(app.execute).to be true
+  end
+
+  it 'coerces command_id to string' do
+    app = described_class.new(:cmd)
+    command = double('command', execute: true)
+
+    app.add_command('cmd', command)
+
+    expect(app.execute).to be true
+  end
+
+  it 'coerces command_key to string' do
+    app = described_class.new('cmd')
+    command = double('command', execute: true)
+
+    app.add_command(:cmd, command)
+
+    expect(app.execute).to be true
+  end
+
+  it 'does not swallow errors from executed command' do
+    app = described_class.new('cmd')
+    command = double
+    allow(command).to receive(:execute).and_raise
+
+    app.add_command(:cmd, command)
+    
+    expect {
+      app.execute
+    }.to raise_error(RuntimeError)
+  end
+
+  it 'raises error when command not found' do
+    app = described_class.new('cmd')
+
+    expect {
+      app.execute
+    }.to raise_error(Balboa::CLI::Application::CommandNotFound)
+  end
+end

data/spec/balboa/interactor_spec.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Balboa::Interactor::CapybaraInteractor do
+  context 'when no login command' do
+    it 'responds to last but raises error' do
+      interactor = described_class.new
+
+      last = double('cmd')
+      interactor.add_command('last', last)
+
+      error = Balboa::Interactor::CapybaraInteractor::LoginCommandNotFound
+      expect { interactor.last }.to raise_error error
+    end
+
+    it 'responds to punch but raises error' do
+      interactor = described_class.new
+
+      punch = double('cmd')
+      interactor.add_command('punch', punch)
+
+      error = Balboa::Interactor::CapybaraInteractor::LoginCommandNotFound
+      expect { interactor.punch(Date.today) }.to raise_error error
+    end
+  end
+
+  it 'responds to last but raises if no command provided' do
+    interactor = described_class.new
+
+    last = double('cmd', execute: true)
+    login = double('login', execute: true)
+
+    interactor.add_command('login', login)
+
+    error = Balboa::Interactor::CapybaraInteractor::CommandNotFound
+    expect {
+      interactor.last
+    }.to raise_error error
+  end
+
+  it 'responds to punch but raises if no command provided' do
+    interactor = described_class.new
+
+    punch = double('cmd', execute: nil)
+    login = double('login', execute: nil)
+
+    interactor.add_command('login', login)
+
+    error = Balboa::Interactor::CapybaraInteractor::CommandNotFound
+    expect {
+      interactor.punch(Date.today)
+    }.to raise_error error
+  end
+
+  it 'signs in only once' do
+    interactor = described_class.new
+
+    last = double('cmd', execute: nil)
+    punch = double('cmd', execute: nil)
+    login = double('login', execute: nil)
+
+    interactor.add_command('punch', punch)
+    interactor.add_command('last', last)
+    interactor.add_command('login', login)
+
+    interactor.punch(Date.today)
+    interactor.last
+
+    expect(login).to have_received(:execute).once
+  end
+
+  it 'stores last command to execute whenever called' do
+    interactor = described_class.new
+
+    last = double('cmd', execute: Date.today)
+    login = double('login', execute: nil)
+
+    interactor.add_command('last', last)
+    interactor.add_command('login', login)
+
+    expect(interactor.last).to eq(Date.today)
+  end
+
+  it 'stores punch command to execute whenever called' do
+    interactor = described_class.new
+    today = Date.today
+
+    punch = double('cmd')
+    allow(punch).to receive(:execute).with(today).and_return(true)
+
+    login = double('login', execute: nil)
+
+    interactor.add_command('punch', punch)
+    interactor.add_command('login', login)
+
+    expect(interactor.punch(today)).to eq(true)
+  end
+end

data/spec/balboa_spec.rb

@@ -6,4 +6,8 @@ describe Balboa do
   it 'has a version number' do
     expect(Balboa::VERSION).not_to be nil
   end
+
+  it 'has a target host' do
+    expect(Balboa::HOST).not_to be nil
+  end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: balboa
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Waldyr de Souza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
-dependencies: []
+date: 2016-07-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.1
+- !ruby/object:Gem::Dependency
+  name: phantomjs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1.0
 description: Make Balboa do the punches for you
 email:
 - waldyr.ar@gmail.com
@@ -18,7 +46,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".balboa"
 - ".gitignore"
 - ".reek"
 - ".rspec"
@@ -36,16 +63,21 @@ files:
 - features/support/env.rb
 - lib/balboa.rb
 - lib/balboa/cli/application.rb
-- lib/balboa/cli/command/last_punch_command.rb
-- lib/balboa/cli/command/make_punch_command.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/star_wars_command.rb
 - lib/balboa/cli/options.rb
+- lib/balboa/host.rb
 - lib/balboa/interactor/capybara_interactor.rb
-- lib/balboa/interactor/command/last_punch_command.rb
+- lib/balboa/interactor/command/fetch_last_punch_command.rb
+- lib/balboa/interactor/command/fill_punch_command.rb
 - lib/balboa/interactor/command/login_command.rb
-- lib/balboa/interactor/command/make_punch_command.rb
+- lib/balboa/interactor/interactor_builder.rb
 - lib/balboa/interactor/interactor_wrapper.rb
 - lib/balboa/version.rb
+- spec/balboa/cli/application_spec.rb
+- spec/balboa/interactor_spec.rb
 - spec/balboa_spec.rb
 - spec/spec_helper.rb
 homepage: 
@@ -73,4 +105,3 @@ signing_key:
 specification_version: 4
 summary: Make Balboa do the punches for you
 test_files: []
-has_rdoc: 

data/.balboa

@@ -1,16 +0,0 @@
----
-email: waldyr.araujo@codeminer42.com
-password: waldyr.araujo@codeminer42.com
-project: 'API Market Place'
-start_at: '08:00'
-lunch_at: '12:00'
-restart_at: '13:00'
-leave_at: '17:00'
-holidays:
-  - 12/06/1992
-  - 12/06/1992
-  - 12/06/1992
-  - 12/06/1992
-  - 12/06/1992
-  - 12/06/1992
-  - 12/06/1992