cantemo-portal-agent 1.2.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cb229847757ad05caf39b18d9bde4d612ca969d
-  data.tar.gz: 94d3cda76321eea6cf31d3f603c9e8c3b84acb3e
+  metadata.gz: deef6be201da32030d9b495463c2c5b2a1a55086
+  data.tar.gz: 89ca91ba9fadf0f204cb9180ca28d3c3110766e7
 SHA512:
-  metadata.gz: cfbad95315007919d44094139bd2469bfdaab96980ecbc729b74735aa3b15ce83d8175c8d92c77cc45076deff9ef794f1222833ea0716195854ba7832f4530a7
-  data.tar.gz: 45e7685f7da882d16f378d5af4d3d67243423fbcd99488ad9398b905ca81802afc575af6db3de7003bd1a12f8c806780815a7a1651585460091a8ec1fae255d6
+  metadata.gz: 7f24e5db79bed7d457b59e0d845aff26e4f388e651ea5378a889ffcde36d3e5d1618a26ef570851501f391fead8ab3779017324ac4b2be668cdd07c7da53db14
+  data.tar.gz: 01d9ab468ba03278a8db51c057210cb8109ab96c37ff6ba719fb2bc581d08f0782695cb8e1d8f80dc99290e14e1547b1138313d236c4f3aa572872bb481a357e

data/lib/cantemo/portal/agent/cli/commands/watch_folders.rb

@@ -46,8 +46,8 @@ op.on_tail('--help', 'Show this message.') { puts op; exit }
 op.load
 op.parse!
 
-command = (ARGV.first || 'run').downcase
-if command == 'help'
+sub_command = (ARGV.first || 'run').downcase
+if sub_command == 'help'
   puts op
   exit
 end
@@ -55,20 +55,14 @@ end
 config_file_path = args[:config_file_path]
 args[:config_file_path].map! { |v| File.expand_path(v) } if config_file_path.is_a?(Array)
 
-daemon_control_command_present = command && begin
-  command = command.dup.downcase if command
-  %w(start stop restart zap killall status).include?(command)
+daemon_control_command_present = sub_command && begin
+  sub_command = sub_command.dup.downcase if sub_command
+  %w(start stop restart zap killall status).include?(sub_command)
 end
+should_daemonize = (daemon_control_command_present && %w(start restart).include?(sub_command)) || args[:daemonize]
 
-if command == 'run'
-  Envoi::Mam::Cantemo::Agent::WatchFolderManager.run(args)
-  exit
-end
-
-
-
-if command
-  case command
+if sub_command
+  case sub_command
   when 'install'
     puts
   when 'uninstall'
@@ -78,15 +72,10 @@ if command
   end
 end
 
-
-should_daemonize = (daemon_control_command_present && %w(start restart).include?(command)) || args[:daemonize]
-
-# puts "#{__FILE__}:#{__LINE__ } #{args}"
-# next_command = ARGV.shift
-# puts "COMMAND: #{next_command}"
-#
-#
-#
+if sub_command == 'run'
+  Envoi::Mam::Cantemo::Agent::WatchFolderManager.run(args)
+  exit
+end
 
 module Application
 
@@ -148,9 +137,113 @@ module Application
 
 end
 
+if !Application::OS.windows?
+  begin
+    Watcher.run_with_process_manager(args)
+    exit
+  rescue => e
+    abort("An error occurred. #{e.message}")
+  end
+end
 
-begin
-  Watcher.run_with_process_manager(args)
-rescue => e
-  abort("An error occurred. #{e.message}")
+# Options:
+#    install    - Installs the service.  The service name is "DemoSvc"
+#                 and the display name is "Demo".
+#    start      - Starts the service.  Make sure you stop it at some point or
+#                 you will eventually fill up your filesystem!.
+#    stop       - Stops the service.
+#    pause      - Pauses the service.
+#    resume     - Resumes the service.
+#    uninstall  - Uninstalls the service.
+#    delete     - Same as uninstall.
+require 'win32/service'
+require 'rbconfig'
+include Win32
+include RbConfig
+
+# Make sure you're using the version you think you're using.
+puts 'VERSION: ' + Service::VERSION
+
+SERVICE_NAME = 'cantemo_portal_watch_folder_agent'
+SERVICE_DISPLAYNAME = 'Cantemo Portal Watch Folder Agent'
+EXECUTABLE_NAME = __FILE__
+
+
+# You must provide at least one argument.
+raise ArgumentError, 'No argument provided' unless sub_command
+
+case sub_command
+when 'install'
+  # Quote the full path to deal with possible spaces in the path name.
+  ruby = File.join(CONFIG['bindir'], CONFIG['ruby_install_name']).tr('/', '\\')
+  path = %Q(#{File.dirname(File.expand_path($0)).tr('/', '\\')}\\#{EXECUTABLE_NAME})
+  cmd = %Q("#{ruby}" "#{path}" run --config-file-path "#{config_file_path}")
+
+  Service.new(
+      :service_name     => SERVICE_NAME,
+      :display_name     => SERVICE_DISPLAYNAME,
+      :description      => 'Watch Folder Agent for Cantemo Portal',
+      :binary_path_name => cmd
+  )
+  puts 'Service ' + SERVICE_NAME + ' installed'
+when 'start'
+  if Service.status(SERVICE_NAME).current_state != 'running'
+    Service.start(SERVICE_NAME, nil)
+    while Service.status(SERVICE_NAME).current_state != 'running'
+      puts 'One moment...' + Service.status(SERVICE_NAME).current_state
+      sleep 1
+    end
+    puts 'Service ' + SERVICE_NAME + ' started'
+  else
+    puts 'Already running'
+  end
+when 'stop'
+  if Service.status(SERVICE_NAME).current_state != 'stopped'
+    Service.stop(SERVICE_NAME)
+    while Service.status(SERVICE_NAME).current_state != 'stopped'
+      puts 'One moment...' + Service.status(SERVICE_NAME).current_state
+      sleep 1
+    end
+    puts 'Service ' + SERVICE_NAME + ' stopped'
+  else
+    puts 'Already stopped'
+  end
+when 'uninstall', 'delete'
+  if Service.status(SERVICE_NAME).current_state != 'stopped'
+    Service.stop(SERVICE_NAME)
+  end
+  while Service.status(SERVICE_NAME).current_state != 'stopped'
+    puts 'One moment...' + Service.status(SERVICE_NAME).current_state
+    sleep 1
+  end
+  Service.delete(SERVICE_NAME)
+  puts 'Service ' + SERVICE_NAME + ' deleted'
+when 'pause'
+  if Service.status(SERVICE_NAME).current_state != 'paused'
+    Service.pause(SERVICE_NAME)
+    while Service.status(SERVICE_NAME).current_state != 'paused'
+      puts 'One moment...' + Service.status(SERVICE_NAME).current_state
+      sleep 1
+    end
+    puts 'Service ' + SERVICE_NAME + ' paused'
+  else
+    puts 'Already paused'
+  end
+when 'resume'
+  if Service.status(SERVICE_NAME).current_state != 'running'
+    Service.resume(SERVICE_NAME)
+    while Service.status(SERVICE_NAME).current_state != 'running'
+      puts 'One moment...' + Service.status(SERVICE_NAME).current_state
+      sleep 1
+    end
+    puts 'Service ' + SERVICE_NAME + ' resumed'
+  else
+    puts 'Already running'
+  end
+when 'status'
+  puts Service.status(SERVICE_NAME)
+else
+  raise ArgumentError, 'unknown option: ' + sub_command
 end
+
+

data/lib/cantemo/portal/agent/version.rb

@@ -1,7 +1,7 @@
 module Cantemo
   module Portal
     class Agent
-      VERSION = '1.2.9'.freeze
+      VERSION = '1.3.0'.freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantemo-portal-agent
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors:
 - John Whitson