boxafe 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjIwY2E2NjkwYTEwNTBjZWU1MTE5NjEwODNiYTc2NTg0YzMyNTQ3YQ==
+    ODMyZGQyNWI3ZDQyMTI2MzNkMjlhNGM4MTc3YzliMzhkZTlhNTM0Mg==
   data.tar.gz: !binary |-
-    OWM4NzA1MTgxYzIyY2I1MDU4YzVjYjg2YTY4NmNhYmU4NTRiMWU2MQ==
+    ZTkyMWRmY2M4NjU1MTAyNDQwMWU4YjEyNWZhYzAzNzgwYmUzNTZkOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTUyOGJjNWY3NTRjNDJmOTAyMjQ0ZGM1NTY4YTk4YThjYTQ5NDgwOWZiNDE4
-    ZTUyNzA2YjcxMzZlN2YzZTYwMjA1MzRmZTllNWFiOWJkODgxOTY4N2I1Mzdl
-    YWRmZDg0ZDNkYjFjNjBkZDlhZDkxNTU5MjljMzc1OWI0ZjA5OGQ=
+    Y2UzNjNmMTg3NzY4MGNlN2I1MjZiNmU2MzNmNTZlMDNiNjdhYzVjNzNhMjdi
+    ZmI2YWFhZjQ3MjY3MGI1Nzg1Y2ZiYzRmOGI0ZjBmYTBmOTY5NjNmZThmZTRj
+    YjhkOGVjMjg4ZDIzZWIxODU0NTAwOWFiNGVhMmRlNzgwY2IxZGM=
   data.tar.gz: !binary |-
-    NzA1NjE5NTNiZDczZTg5Y2Q5ZmNmODg2Mjg4ODdjYzQ3YzEzMDVmYzkzYjA5
-    MzEyOTFkOTk4NGFhNjc0Y2EwNWI2YWEyZmMzZTczNWVlNWQ4MTFmMzc5YWM4
-    NTE4ZmY5MzNmYzQ5N2ZmMDM0NjViZWQzZjEyODc1ZTczOTM5YWQ=
+    ZjI2NWNhNmYzMjNjOGVkYWQ2ZWY5OTJkYjQ1ZjEwMWE3ZTNmMDAzNzgxNDVm
+    MTE3NzlmMzIxMWE2ODA3OGZkNjNlMWNmMWE4YjFiNjdkOTRlMTQ1NjcyNzZh
+    MDBjZDBmYzI3NDRhZTRhMTY0MzNhYmUzNWRjZjQ1ODk5YzZjOWU=

data/Gemfile

@@ -9,6 +9,8 @@ gem 'which_works', '~> 1.0.0'
 gem 'dotenv', '~> 0.8.0'
 gem 'mutaconf', '~> 0.2.0'
 gem 'launchdr', '3'
+gem 'growl', '~> 1.0.3'
+gem 'terminal-notifier-guard', '~> 1.5.3'
 #gem 'whenever', '~> 0.8.2'
 #gem 'whenever', :git => 'git@github.com:AlphaHydrae/whenever.git', :branch => 'block-config'
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/boxafe/cli.rb

@@ -34,16 +34,20 @@ class Boxafe::CLI
     # FIXME: crashes with unknown box names
     boxes = args.empty? ? config.boxes : args.collect{ |arg| config.boxes.find{ |box| box.name == arg } }
 
+    notifier = Boxafe::Notifier.notifier config.options
+
     puts
     boxes.each do |box|
 
       print "Mounting #{box.name}... "
       case box.mount_status
       when :mounted
+        notifier.notify "#{box.name} is already mounted" if notifier
         puts Paint['already mounted', :green]
         next
       when :invalid
-        puts Paint['invalid mount point', :red]
+        notifier.notify "#{box.name} has an invalid mount point (not a directory)", type: :failure if notifier
+        puts Paint['invalid mount point (not a directory)', :red]
         next
       end
 
@@ -52,8 +56,10 @@ class Boxafe::CLI
 
       puts case box.mount_status
       when :mounted
+        notifier.notify "#{box.name} is mounted", type: :success if notifier
         Paint['mounted', :green]
       else
+        notifier.notify "#{box.name} could not be mounted", type: :failure if notifier
         Paint['could not be mounted', :red]
       end
     end

data/lib/boxafe/config.rb

@@ -2,7 +2,7 @@
 class Boxafe::Config
 
   # TODO: document unmount_delay
-  OPTION_KEYS = [ :encfs, :umount, :umount_delay ]
+  OPTION_KEYS = [ :encfs, :umount, :umount_delay, :notify ]
 
   attr_reader :boxes, :options
 

data/lib/boxafe/encfs.rb

@@ -8,13 +8,14 @@ class Boxafe::Encfs
   end
 
   def command
-    [ encfs_config, @options[:encfs], %/"#{@options[:root]}"/, %/"#{@options[:mount]}"/, extpass, '--', volname ].compact.join ' '
+    # TODO: use shellwords for binary, test escaping
+    [ encfs_config, @options[:encfs], Shellwords.escape(@options[:root]), Shellwords.escape(@options[:mount]), extpass, '--', volname ].compact.join ' '
   end
 
   private
 
   def volname
-    %/-ovolname="#{@options[:volume]}"/
+    %/-ovolname=#{Shellwords.escape @options[:volume]}/
   end
 
   def extpass
@@ -26,6 +27,6 @@ class Boxafe::Encfs
   end
 
   def encfs_config
-    @options[:encfs_config] ? %/ENCFS6_CONFIG="#{File.expand_path @options[:encfs_config]}"/ : nil
+    @options[:encfs_config] ? %/ENCFS6_CONFIG=#{Shellwords.escape File.expand_path(@options[:encfs_config])}/ : nil
   end
 end

data/lib/boxafe/notifier/growl.rb

@@ -0,0 +1,27 @@
+# encoding: UTF-8
+require 'growl'
+
+class Boxafe::Notifier::Growl < Boxafe::Notifier
+  METHODS = {
+    info: :notify_info,
+    success: :notify_ok,
+    failure: :notify_error
+  }
+
+  def self.available?
+    ::Growl.installed?
+  end
+
+  def notify msg, options = {}
+    method = METHODS[options.delete(:type)] || :notify_info
+    ::Growl.send method, msg, growl_options(options)
+  end
+
+  private
+
+  def growl_options options = {}
+    @options.dup.tap do |h|
+      h[:title] = options[:title] if options[:title]
+    end
+  end
+end

data/lib/boxafe/notifier/notification_center.rb

@@ -0,0 +1,27 @@
+# encoding: UTF-8
+require 'terminal-notifier-guard'
+
+class Boxafe::Notifier::NotificationCenter < Boxafe::Notifier
+  METHODS = {
+    info: :notify,
+    success: :success,
+    failure: :failed
+  }
+
+  def self.available?
+    TerminalNotifier::Guard.available?
+  end
+
+  def notify msg, options = {}
+    method = METHODS[options.delete(:type)] || :notify
+    TerminalNotifier::Guard.send method, msg, terminal_notifier_options(options)
+  end
+
+  private
+
+  def terminal_notifier_options options = {}
+    @options.dup.tap do |h|
+      h[:title] = options[:title] if options[:title]
+    end
+  end
+end

data/lib/boxafe/notifier.rb

@@ -0,0 +1,43 @@
+# encoding: UTF-8
+
+class Boxafe::Notifier
+  IMPLEMENTATIONS = %w(growl notification_center)
+
+  def self.notifier options = {}
+    if options[:notify] == true
+      platform_notifier options
+    elsif IMPLEMENTATIONS.include?(name = options[:notify].to_s)
+      notifier_instance name, options
+    elsif options.key?(:notify) and options[:notify] != false
+      raise Boxafe::Error, "Unknown notification type #{options[:notify].inspect}"
+    end
+  end
+
+  def self.notifier_instance name, options = {}
+    impl = Boxafe::Notifier.const_get(name.gsub(/(?:\A|_)(.)/){ $1.upcase })
+    impl.available? ? impl.new(options) : nil
+  end
+
+  def self.platform_notifier options = {}
+
+    candidates = case RbConfig::CONFIG['host_os']
+    when /darwin/i
+      %w(notification_center growl)
+    else
+      []
+    end
+
+    candidates.each do |name|
+      notifier = notifier_instance name, options
+      return notifier if notifier
+    end
+
+    nil
+  end
+
+  def initialize options = {}
+    @options = { title: 'Boxafe' }.merge options
+  end
+end
+
+Dir[File.join File.dirname(__FILE__), File.basename(__FILE__, '.*'), '*.rb'].each{ |lib| require lib }

data/lib/boxafe.rb

@@ -4,7 +4,7 @@ require 'dotenv'
 require 'mutaconf'
 
 module Boxafe
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 
   # TODO: add detailed error description for non-trace mode
   class Error < StandardError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxafe
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - AlphaHydrae
@@ -94,6 +94,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +253,9 @@ files:
 - lib/boxafe/cli.rb
 - lib/boxafe/config.rb
 - lib/boxafe/encfs.rb
+- lib/boxafe/notifier.rb
+- lib/boxafe/notifier/growl.rb
+- lib/boxafe/notifier/notification_center.rb
 - lib/boxafe/program.rb
 - lib/boxafe/scheduler.rb
 - lib/boxafe/scheduler/cron.rb