henchman-sync 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34113b7a846cd62928aa75e9698a466ee237357f
-  data.tar.gz: 2b0ca4b2d1bb0212c6072c399f5ed8db8278d7a5
+  metadata.gz: 268f8796ffcc52cc93450042d33c1303b5620b8b
+  data.tar.gz: 26b828d81890a194303180767bad326a1c863621
 SHA512:
-  metadata.gz: 74ca677b0cffdcc6fb94947f1a248e53ef2ca074e8b41472b92fa53d33b11e3b1bff1ae4cc2783397a33b0b45fde5ea30f0328877515d91c4a5d68514f4f49f3
-  data.tar.gz: bab19023bb414a722b905540479d1297ddd9fa25983c239ca112b3eb8a9114316211332a0ec49aedb8b900198f1a99103062fcb422580a2f5afa27c835ef0667
+  metadata.gz: 678c2e611262bfc9236c7bbee2bf9cda2be634389322f9a1180a373ba0b052549f03440125566c01ff87fb67c19189d24cdb7400931a02923fa8f0c79c560831
+  data.tar.gz: a37aeb86dce167e4e509d723d01157637374d366773e3cfb287c6164b46c02d26a50b2372be038dd5c68bbc84a0215c335a5f267da5065b8ba90f44443ed8a69

data/lib/applescript.rb

@@ -275,9 +275,13 @@ module Henchman
     end
 
     def set_track_location selection, local_file
+      puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+           "Updating location of #{selection.reject{|k,v| k == :path || k == :id}.values.join(':')} to #{local_file}"
+
       ret = %x(#{applescript_command(update_track_location_script selection[:id], local_file)}).chomp
       if ret.empty? || ret == '0'
-        puts "Could not update location of #{selection.values.join(':')} to #{local_file}"
+        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+             "Could not update location of #{selection.reject{|k,v| k == :path || k == :id}.values.join(':')} to #{local_file}"
         false
       else
         true

data/lib/cache.rb

@@ -13,7 +13,8 @@ module Henchman
 
         @cache[:ignore].each_value { |val| val.default = 0 }
       rescue StandardError => err
-        puts "Error opening cache file (#{err})"
+        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+             "Error opening cache file (#{err})"
         @cache = Henchman::Templates.cache
       end
       @cache[:history].default = DateTime.new
@@ -51,7 +52,8 @@ module Henchman
 
     def valid_ignore_type? type
       if !(Henchman::Templates.cache[:ignore].keys.include? type)
-        puts "Invalid type '#{type}' for ignore cache check"
+        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+             "Invalid type '#{type}' for ignore cache check"
         false
       else
         true

data/lib/clean.rb

@@ -8,7 +8,8 @@ module Henchman
 
     def self.run played_date
 
-      puts "Cleanup ran at #{DateTime.now.strftime('%m-%d-%Y %k:%M:%S%p')}"
+      puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+           "Cleanup Starting"
 
       played_date = (played_date == 'true') ? true : false
 
@@ -19,7 +20,8 @@ module Henchman
         @cache.config @config
         @appleScript.setup @config
       rescue StandardError => err
-        puts "Error opening config file. Try rerunning `henchman configure`"
+        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+             "Error opening config file. Try rerunning `henchman configure`"
         return
       end
 
@@ -35,19 +37,24 @@ module Henchman
 
       @cache.flush
 
+      puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+           "Cleanup Finished"
+
     end
 
     def self.cleanup track
       filepath = track[:path]
       File.delete filepath
       @cache.delete track
-      puts "Deleted #{filepath}"
+      puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+           "Deleted #{filepath}"
 
       while File.dirname(filepath) != @config[:root]
         filepath = File.dirname(filepath)
         begin
           Dir.rmdir(filepath)
-          puts "Deleted #{filepath}"
+          puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+               "Deleted #{filepath}"
         rescue SystemCallError => msg
           break
         end

data/lib/core.rb

@@ -18,7 +18,8 @@ module Henchman
           @config = YAML.load_file(File.expand_path('~/.henchman/config'))
           @cache.config @config
         rescue StandardError => err
-          puts "Error opening config file. Try rerunning `henchman configure`"
+          puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+               "Error opening config file. Try rerunning `henchman configure`"
           return
         end
 
@@ -26,7 +27,8 @@ module Henchman
         begin
           @dropbox = Henchman::DropboxAssistant.new @config
         rescue
-          puts "Error connecting to Dropbox. Try rerunning `henchman configure`"
+          puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+               "Error connecting to Dropbox. Try rerunning `henchman configure`"
           return
         end
 
@@ -65,7 +67,7 @@ module Henchman
                   end
                 end
               rescue StandardError => err
-                puts err
+                puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|#{err}"
                 next
               end
             end
@@ -100,6 +102,7 @@ module Henchman
 
     def self.itunes_is_active?
       @appleScript.get_active_app == 'iTunes'
+      # true
     end
 
     def self.download_tracks album_tracks
@@ -121,7 +124,7 @@ module Henchman
           cleanup file_save_path, track if !updated
         end
       rescue StandardError => err
-        puts err
+        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|#{err}"
       end
     end
 

data/lib/dropbox.rb

@@ -12,15 +12,17 @@ module Henchman
         @client = DropboxClient.new(@config[:dropbox][:access_token])
         true
       rescue DropboxError => msg
-        puts "Couldn't connect to Dropbox (#{msg}). \n"\
-             "Run `henchman stop` then `henchman configure` \n"\
+        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+             "Couldn't connect to Dropbox (#{msg}). "\
+             "Run `henchman stop` then `henchman configure` "\
              "to configure Dropbox connection."
         false
       end
     end
 
     def download selection, dropbox_path
-      puts "downloading #{selection[:track]}"
+      puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+           "Downloading #{selection.reject{|k,v| k == :path || k == :id}.values.join(':')}"
       begin
         # download the file
         content = @client.get_file(dropbox_path)
@@ -34,20 +36,25 @@ module Henchman
         open(file_save_path, 'w') {|f| f.puts content }
         file_save_path
       rescue DropboxError => msg
-        puts "Error downloading Dropbox file #{dropbox_path}: #{msg}"
+        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+             "Error downloading Dropbox file #{dropbox_path}: #{msg}"
         false
       rescue StandardError => msg
-        puts "Error saving Dropbox file #{dropbox_path} to #{trgt_dir}: #{msg}"
+        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+             "Error saving Dropbox file #{dropbox_path} to #{trgt_dir}: #{msg}"
         false
       end
     end
 
     def search_for selection
+      puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+           "Searching for #{selection.reject{|k,v| k == :path || k == :id}.values.join(':')}"
+
       # search Dropbox for the file
       begin
         results = @client.search(@config[:dropbox][:root], selection[:track])
       rescue DropboxError => msg
-        raise "Error accessing Dropbox Search API on #{selection.values.join(':')}: #{msg}"
+        raise "Error accessing Dropbox Search API on #{selection.reject{|k,v| k == :path || k == :id}.values.join(':')}: #{msg}"
       end
 
       # get rid of any results that are directories

data/lib/henchman/version.rb

@@ -1,3 +1,3 @@
 module Henchman
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/launchd_handler.rb

@@ -34,23 +34,29 @@ module Henchman
       `launchctl load #{plist_path_clean}`
 
       puts "Launched successfully! You are now running henchman."
+      open(File.expand_path("~/.henchman/stdout.log"), 'a') do |f|
+        f.puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|Henchman Started"
+      end
     end
 
     def self.stop
       puts "Stopping agents"
       plist_path_main = File.expand_path("~/Library/LaunchAgents/com.henchman.plist")
       plist_path_clean = File.expand_path("~/Library/LaunchAgents/com.henchman.clean.plist")
-      `launchctl unload #{plist_path_main}`
-      `launchctl unload #{plist_path_clean}`
-      `rm #{plist_path_main}`
-      `rm #{plist_path_clean}`
-      `rm #{File.expand_path("~/.henchman/run.sh")}`
-      `rm #{File.expand_path("~/.henchman/clean.sh")}`
-      `rm #{File.expand_path("~/.henchman/cache")}`
-      `rm #{File.expand_path("~/.henchman/stdout.log")}`
-      `rm #{File.expand_path("~/.henchman/stderr.log")}`
+      `launchctl unload #{plist_path_main} 2> /dev/null`
+      `launchctl unload #{plist_path_clean} 2> /dev/null`
+      `rm #{plist_path_main} 2> /dev/null`
+      `rm #{plist_path_clean} 2> /dev/null`
+      `rm #{File.expand_path("~/.henchman/run.sh")} 2> /dev/null`
+      `rm #{File.expand_path("~/.henchman/clean.sh")} 2> /dev/null`
+      `rm #{File.expand_path("~/.henchman/cache")} 2> /dev/null`
+      # `rm #{File.expand_path("~/.henchman/stdout.log")} 2> /dev/null`
+      # `rm #{File.expand_path("~/.henchman/stderr.log")} 2> /dev/null`
 
       puts "Successfully stopped henchman"
+      open(File.expand_path("~/.henchman/stdout.log"), 'a') do |f|
+        f.puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|Henchman Stopped"
+      end
     end
 
     def self.internet_connection?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: henchman-sync
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Greg Merritt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander