working_man 0.0.6 → 0.1.1

data/bin/working_man

@@ -8,9 +8,8 @@ include Methadone::Main
 include Methadone::CLILogging
 
 main do |run_type|
-  # your program code here
-  # You can access CLI options via
-  # the options Hash
+  check_config!
+  
   case run_type
   when "start"
     WorkingMan.start_work
@@ -19,12 +18,52 @@ main do |run_type|
   end
 end
 
-# supplemental methods here
+# 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!
+#
+# Returns true if everything passes
+def check_config!
+  config_path = File.expand_path('~/.working_man.yml')
+  
+  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
 
-# Declare command-line interface here
+# 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.
 #
-description "WorkingMan starts and stops your work day"
+# 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"
+
 # Require run_type
 arg :run_type, "'start' or 'stop' your work day"
 

data/features/working_man.feature

@@ -24,17 +24,6 @@ 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 with app and no url
-  Given a file named "/tmp/fakehome/.working_man.yml" with:
-    """
-    apps:
-      - 'Twitter'
-    urls:
-    """
-  And I run `working_man start`
-  Then the output should contain "Work hard today"
-  And the exit status should be 0
 
 Scenario: Start work unsuccessfully without any apps
   Given a file named "/tmp/fakehome/.working_man.yml" with:

data/lib/working_man/version.rb

@@ -1,3 +1,3 @@
 module WorkingMan
-  VERSION = "0.0.6"
+  VERSION = "0.1.1"
 end

data/lib/working_man.rb

@@ -4,7 +4,7 @@ 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
+  # 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.
   #
@@ -12,48 +12,25 @@ module WorkingMan
   #
   #   WorkingMan.start_work
   def self.start_work
-    if File.exists?(File.expand_path('~/.working_man.yml'))
-      @config = YAML::load(File.open(File.expand_path('~/.working_man.yml')))
-      print "Starting work...\n"
-      begin
-        WorkingMan::Actions.launch_applications(@config['apps'])
-      rescue NoMethodError
-        p "No applications in configuration"
-        exit(2)
-      end
-      
-      begin
-        WorkingMan::Actions.open_urls(@config['urls'])
-      rescue NoMethodError
-      end
-      print "Work hard today!\n"
-      return true
-    else
-      puts "No configuration found. Please configure which apps to start in ~/.working_man.yml."
-      exit(1)
-    end
+    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
+  # Internal: Stop work iterates through the apps in $config['apps'], stopping
   # each one
   #
   # Examples:
   #
   #   WorkingMan.stop_work
   def self.stop_work
-    if File.exists?(File.expand_path('~/.working_man.yml'))
-      @config = YAML::load(File.open(File.expand_path('~/.working_man.yml')))
-      print "Stopping work...\n"
-      begin
-        WorkingMan::Actions.close_applications(@config['apps'])
-      rescue NoMethodError
-        p "No applications in configuration"
-        exit(2)
-      end
-      print "Have a great day!\n"
-    else
-      puts "No configuration found. Please configure which apps to start in ~/.working_man.yml."
-      exit(1)
-    end
+    print "Stopping work...\n"
+
+    WorkingMan::Actions.close_applications($config['apps'])
+
+    print "Have a great day!\n"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: working_man
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc