blertr 0.1.6 → 0.2.0

data/bin/blertr

@@ -52,24 +52,34 @@ EOS
 end
 
 def take_action action, parameters
+  blertr_path = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+  blertr_local_dir = File.expand_path("~/.blertr")
+  blertr_symlink = File.join(blertr_local_dir, "app")
   case action
   when "help"
     help
   when "install"
-    blertr_path = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-    blertr_symlink = File.expand_path("~/.blertr")
     if File.exists? blertr_symlink
-      puts "ERROR: Blertr appears to already be installed.\nUninstall with blertr remove"
+      puts "ERROR: Blertr appears to already be installed.\nUninstall with blertr uninstall"
     else
+      puts "creating #{blertr_local_dir} directory"
+      system("mkdir -p #{blertr_local_dir}")
+
       puts "creating symlink from #{blertr_path} to #{blertr_symlink}"
       system("ln -s #{blertr_path} #{blertr_symlink}")
+
+      config_dir = File.expand_path(Blertr::CONFIG_DIR_PATH)
+      if !File.exists?(config_dir)
+        blertr_config_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "config"))
+        puts "copying config files to #{blertr_path}"
+        system("cp -r #{blertr_config_dir} #{blertr_local_dir}")
+      end
       puts "Blertr is now (almost) installed!\nPut this at the bottom of your .bashrc file:"
-      puts "[[ -s \"$HOME/.blertr/scripts/blertr\" ]] && . \"$HOME/.blertr/scripts/blertr\""
+      puts "[[ -s \"$HOME/.blertr/app/scripts/blertr\" ]] && . \"$HOME/.blertr/app/scripts/blertr\""
     end
   when "uninstall"
-    blertr_symlink = File.expand_path("~/.blertr")
     if File.exists? blertr_symlink
-      puts "Removing ~/.blertr"
+      puts "Removing #{blertr_symlink}"
       system("rm #{blertr_symlink}")
       puts "Blertr is now (almost) uninstalled.\nRemove from .bashrc file:"
       puts "[[ -s \"$HOME/.blertr/scripts/blertr\" ]] && . \"$HOME/.blertr/scripts/blertr\""

data/lib/blertr/constants.rb

@@ -0,0 +1,3 @@
+module Blertr
+  CONFIG_DIR_PATH = "~/.blertr/config"
+end

data/lib/blertr/options.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'blertr/constants'
 
 module Blertr
   class Options
@@ -28,7 +29,12 @@ module Blertr
     end
 
     def self.config_path
-      File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config"))
+      # first try local config
+      path = File.expand_path(CONFIG_DIR_PATH)
+      if !File.exists?(path)
+        path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config"))
+      end
+      path
     end
 
     def self.config_file_for name

data/lib/blertr/version.rb

@@ -1,3 +1,3 @@
 module Blertr
-  VERSION = "0.1.6".freeze
+  VERSION = "0.2.0".freeze
 end

data/lib/blertr.rb

@@ -1,2 +1,4 @@
 
+require 'blertr/constants'
 require 'blertr/control'
+

data/scripts/blertr

@@ -36,9 +36,9 @@ then
   then
     if [[ "$blertr_prefix" = "$HOME" ]]
     then
-      blertr_path="${blertr_prefix}/.blertr"
+      blertr_path="${blertr_prefix}/.blertr/app"
     else
-      blertr_path="${blertr_prefix}/blertr"
+      blertr_path="${blertr_prefix}/blertr/app"
     fi
   fi
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blertr
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -92,6 +92,7 @@ files:
 - config/notify_send_config.yaml
 - lib/blertr.rb
 - lib/blertr/blacklist.rb
+- lib/blertr/constants.rb
 - lib/blertr/control.rb
 - lib/blertr/growl_notifier.rb
 - lib/blertr/mail_notifier.rb