working_man 0.3.0 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0f8c9d1f1dadb1f09f69c6b4412c03edb4a53a70
+  data.tar.gz: ff0a41774615e60a8122a01293fdc0fd55815152
+SHA512:
+  metadata.gz: 8da4643b976351d89a87efd9c4b7e2c7830cb765d1320ed2ce8929c86e06536b314f1e283af27c2f76884e06dbeb27f529db335c2c5789af65e04482ad911c5f
+  data.tar.gz: 612e69bb62edbf10fbe5b27d939f5e705f2b3278531fbe42196e247ba919513db83967ca37deb8ff44d730ac59498ccf192ceb35c866ac760fd399aceaf23bdb

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in working_man.gemspec
 gemspec

data/Gemfile.lock

@@ -1,50 +1,51 @@
 PATH
   remote: .
   specs:
-    working_man (0.3.0)
-      methadone (~> 1.2.1)
+    working_man (1.0.0)
+      thor (~> 0.18.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    aruba (0.5.0)
-      childprocess (= 0.2.3)
+    aruba (0.5.4)
+      childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
-      ffi (>= 1.0.11)
       rspec-expectations (>= 2.7.0)
-    builder (3.1.4)
-    childprocess (0.2.3)
-      ffi (~> 1.0.6)
-    cucumber (1.2.1)
+    builder (3.2.2)
+    childprocess (0.5.1)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.3.12)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    diff-lcs (1.1.3)
-    ffi (1.0.11)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
-    json (1.6.5)
-    methadone (1.2.1)
-      bundler
-    rake (0.9.2.2)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    diff-lcs (1.2.5)
+    ffi (1.9.3)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    json (1.8.1)
+    multi_json (1.9.2)
+    multi_test (0.1.1)
+    rake (10.1.1)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    thor (0.18.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 0.5)
-  rake (~> 0.9.2)
+  aruba (~> 0.5.4)
+  rake (~> 10.1.1)
   rdoc
-  rspec (~> 2.9)
+  rspec (~> 2.14.1)
   working_man!

data/bin/working_man

@@ -1,78 +1,6 @@
 #!/usr/bin/env ruby
+$:.unshift(File.expand_path('../../lib', __FILE__))
 
-require 'optparse'
-require 'methadone'
 require 'working_man'
 
-include Methadone::Main
-include Methadone::CLILogging
-
-main do |run_type|
-  config_path = File.expand_path("#{options[:file]}")
-  
-  check_config(config_path)
-  
-  case run_type
-  when "start"
-    WorkingMan.start_work
-  when "stop"
-    WorkingMan.stop_work
-  end
-end
-
-# Internal: Checks for a configuration file. If one is not found, message
-# is printed to the console and system exits with status code "1"
-#
-# Examples:
-#
-#   check_config(config_path)
-#
-# Returns true if everything passes
-def check_config(config_path)
-  if File.exists?(config_path)
-    check_config_format(config_path)
-    return true
-  else
-    puts "No configuration found. Please configure which apps to start in #{config_path}"
-    exit 1
-  end
-end
-
-# Internal: Checks the format of the configuration file. If the configuration
-# is blank, exits with status "2". If there are no apps, exits with status "3"
-# If there are no URLs, prints a warning but continues with execution.
-#
-# Examples:
-#
-#   check_config_format(config_path)
-#
-# Returns true if everything passes
-def check_config_format(config_path)
-  $config = YAML::load(File.open(config_path))
-  
-  if !$config
-    p "Nothing in configuration. Exiting..."
-    exit 2
-  elsif !$config['apps']
-    p "No applications in configuration. Exiting..."
-    exit 2
-  elsif !$config['urls']
-    p "WARN: No URLs in configuration"
-    return true
-  end
-end
-
-description "WorkingMan starts and stops your work day"
-
-on('-f path_to_file',
-   '--file',
-   'Specify a different location for YAML config file')
-
-options[:file] = '~/.working_man.yml'
-
-# Require run_type
-arg :run_type, "'start' or 'stop' your work day"
-
-version WorkingMan::VERSION
-
-go!
+WorkingMan::CLI.start(ARGV)

data/features/support/env.rb

@@ -1,5 +1,4 @@
 require 'aruba/cucumber'
-require 'methadone/cucumber'
 
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')
@@ -12,7 +11,7 @@ Before do
   @puts = true
   @original_rubylib = ENV['RUBYLIB']
   ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
-  
+
   # Setup fake home directory in /tmp/fakehome before tests
   @real_home = ENV['HOME']
   ENV['HOME'] = '/tmp/fakehome'

data/features/support/step_definitions.rb

@@ -0,0 +1,8 @@
+When /^I get help for "([^"]*)"$/ do |app_name|
+  @app_name = app_name
+  step %(I run `#{app_name} --help`)
+end
+
+Then /^the output should print the version$/ do
+  assert_partial_output(WorkingMan::VERSION, all_output)
+end

data/features/working_man.feature

@@ -6,13 +6,23 @@ So that I can be lazy
 Scenario: App just runs
   When I get help for "working_man"
   Then the exit status should be 0
-  And the banner should be present
-  And the banner should document that this app takes options
-  And the following options should be documented:
-    |--version|
-  And the banner should document that this app's arguments are:
-    | run_type | which is required |
-  
+  And the output should contain "Commands:"
+
+Scenario: Prints the version number
+  When I run `working_man version`
+  Then the output should print the version
+  And the exit status should be 0
+
+Scenario: Prints the version number when using "-v"
+  When I run `working_man -v`
+  Then the output should print the version
+  And the exit status should be 0
+
+Scenario: Prints the version number when using "--version"
+  When I run `working_man --version`
+  Then the output should print the version
+  And the exit status should be 0
+
 Scenario: Start work successfully with app and url
   Given a file named "/tmp/fakehome/.working_man.yml" with:
     """
@@ -24,7 +34,7 @@ Scenario: Start work successfully with app and url
   And I run `working_man start`
   Then the output should contain "Work hard today"
   And the exit status should be 0
-  
+
 Scenario: Start work successfully specifying a config file
   Given a file named "/tmp/fakehome/dotfiles/working_man_config.yml" with:
     """
@@ -33,7 +43,7 @@ Scenario: Start work successfully specifying a config file
     urls:
       - 'http://www.google.com'
     """
-  When I run `working_man -f ~/dotfiles/working_man_config.yml start`
+  When I run `working_man start -f ~/dotfiles/working_man_config.yml`
   Then the output should contain "Work hard today"
   And the exit status should be 0
 
@@ -47,13 +57,13 @@ Scenario: Start work unsuccessfully without any apps
   And I run `working_man start`
   Then the output should contain "No applications in configuration"
   And the exit status should be 2
-  
+
 Scenario: Start work unsuccessfully without a configuration
   Given a file named "/tmp/fakehome/.working_man.yml" should not exist
   When I run `working_man start`
   Then the output should contain "No configuration found."
   And the exit status should be 1
-  
+
 Scenario: Stop work successfully
   Given a file named "/tmp/fakehome/.working_man.yml" with:
     """

data/lib/working_man/cli/config.rb

@@ -0,0 +1,49 @@
+require 'yaml'
+
+module WorkingMan
+  class CLI
+    class Config
+      # Internal: Checks for a configuration file. If one is not found, message
+      # is printed to the console and system exits with status code "1"
+      #
+      # Examples:
+      #
+      #   check_config(config_path)
+      #
+      # Returns true if everything passes
+      def self.check_config(config_path)
+        if File.exists?(config_path)
+          check_config_format(config_path)
+          return true
+        else
+          puts "No configuration found. Please configure which apps to start in #{config_path}"
+          exit 1
+        end
+      end
+
+      # Internal: Checks the format of the configuration file. If the configuration
+      # is blank, exits with status "2". If there are no apps, exits with status "3"
+      # If there are no URLs, prints a warning but continues with execution.
+      #
+      # Examples:
+      #
+      #   check_config_format(config_path)
+      #
+      # Returns true if everything passes
+      def self.check_config_format(config_path)
+        $config = YAML::load(File.open(config_path))
+
+        if !$config
+          p "Nothing in configuration. Exiting..."
+          exit 2
+        elsif !$config['apps']
+          p "No applications in configuration. Exiting..."
+          exit 2
+        elsif !$config['urls']
+          p "WARN: No URLs in configuration"
+          return true
+        end
+      end
+    end
+  end
+end

data/lib/working_man/cli.rb

@@ -0,0 +1,44 @@
+require 'thor'
+
+module WorkingMan
+  class CLI < Thor
+    require 'working_man/cli/config'
+
+    class_option :file, default: '~/.working_man.yml', aliases: '-f'
+
+    desc 'start', 'Starts your work day'
+    def start
+      configuration_check(options[:file])
+
+      print "Staring work...\n"
+
+      WorkingMan::Actions.launch_applications($config['apps'])
+      WorkingMan::Actions.open_urls($config['urls'])
+
+      print "Work hard today!\n"
+    end
+
+    desc 'stop', 'Stop working and go home!'
+    def stop
+      configuration_check(options[:file])
+
+      print "Stopping work...\n"
+
+      WorkingMan::Actions.close_applications($config['apps'])
+
+      print "Have a great day!\n"
+    end
+
+    desc 'version', 'Print the version'
+    def version
+      print "#{WorkingMan::VERSION}\n"
+    end
+    map ['-v', '--version'] => :version
+
+    private
+    def configuration_check(file)
+      config_path = File.expand_path(file)
+      WorkingMan::CLI::Config.check_config(config_path)
+    end
+  end
+end

data/lib/working_man/version.rb

@@ -1,3 +1,3 @@
 module WorkingMan
-  VERSION = "0.3.0"
+  VERSION = "1.0.0"
 end

data/lib/working_man.rb

@@ -1,36 +1,6 @@
-require "yaml"
-require "working_man/version"
-require "working_man/actions"
-
 module WorkingMan
-  # Internal: Starts work day by calling WorkingMan::Actions#launch_applications,
-  # iterating through each app in $config['apps']. It exits if there are no
-  # applications with error code 2. If there are no URLs, the program finishes
-  # successfully.
-  #
-  # Examples:
-  #
-  #   WorkingMan.start_work
-  def self.start_work
-    print "Starting work...\n"
-    
-    WorkingMan::Actions.launch_applications($config['apps'])
-    WorkingMan::Actions.open_urls($config['urls'])
-
-    print "Work hard today!\n"
-  end
-  
-  # Internal: Stop work iterates through the apps in $config['apps'], stopping
-  # each one
-  #
-  # Examples:
-  #
-  #   WorkingMan.stop_work
-  def self.stop_work
-    print "Stopping work...\n"
-
-    WorkingMan::Actions.close_applications($config['apps'])
-
-    print "Have a great day!\n"
-  end
 end
+
+require 'working_man/version'
+require 'working_man/cli'
+require 'working_man/actions'

data/working_man.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = WorkingMan::VERSION
   gem.add_development_dependency 'rdoc'
-  gem.add_development_dependency 'rake',      '~> 0.9.2'
-  gem.add_development_dependency 'aruba',     '~> 0.5'
-  gem.add_development_dependency 'rspec',     '~> 2.9'
-  gem.add_dependency             'methadone', '~> 1.2.1'
+  gem.add_development_dependency 'rake',  '~> 10.1.1'
+  gem.add_development_dependency 'aruba', '~> 0.5.4'
+  gem.add_development_dependency 'rspec', '~> 2.14.1'
+  gem.add_runtime_dependency     'thor',  '~> 0.18.1'
 end

metadata

@@ -1,96 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: working_man
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Evan Machnic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
-  name: methadone
+  name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.18.1
 description: Start/stop your work apps for the day
 email:
 - emachnic@broadmac.net
@@ -99,9 +88,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -109,42 +98,39 @@ files:
 - Rakefile
 - bin/working_man
 - features/support/env.rb
+- features/support/step_definitions.rb
 - features/working_man.feature
 - lib/resources/working_man.yml
 - lib/working_man.rb
 - lib/working_man/actions.rb
+- lib/working_man/cli.rb
+- lib/working_man/cli/config.rb
 - lib/working_man/version.rb
 - working_man.gemspec
 homepage: http://emachnic.github.com/working_man
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2595108310435164614
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2595108310435164614
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Start/stop your work apps for the day
 test_files:
 - features/support/env.rb
+- features/support/step_definitions.rb
 - features/working_man.feature