chupacabra 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 292aa1a38a82238b386ed03e4285bc28ef45a9ff
-  data.tar.gz: a6a88c629ed0f410d9c3a68c88d1196705d20b9e
+  metadata.gz: 9ec68bad383e9cceb15138495e74860362e0b12d
+  data.tar.gz: f24efc3d43cf7ff35f298592b0afc9a0de163142
 SHA512:
-  metadata.gz: af9d4bf003b618e1807bccfbdf4798d6b46b1a6b2512941e92665e819a8255915fe42dbffc43c8427756df8a227bf82a67f3ec71dd098f7382379c28ef3814fb
-  data.tar.gz: 71a86980d2a5236f0cf9f4e779984175f79277764eacfef2cbcfe82178d740108ddc43c724223b5c853e8fc1f3c5693be76ff60891379276416e5cf5422fd752
+  metadata.gz: 3e46a7c47897dc75e21840bbf7b164b578fb81e0fd847ba8c8ba93d9fd198bb0bf821f26a37c022fdded16b5116a238bb43ff3272e25e709b22f5e98667e567a
+  data.tar.gz: e50b37e32d503cfd6b8ee1ffbe21b3998f9fd372023f0fe186ce0e29ed1352d4d8cd679a2c0c103609548cc675d034318c059e6b02cab1f2807b0430b4b919a1

data/bin/chupacabra

@@ -21,8 +21,8 @@ OptionParser.new do |opts|
   end
 
   opts.on("-i", "--install", "Install Apple service") do |port|
-    Chupacabra::System.install
-    puts "Service installed in #{Chupacabra::System.user_service_path}"
+    Chupacabra::System::Install.install
+    puts "Service installed in #{Chupacabra::System::Install.user_service_path}"
     puts ""
     puts "You can create keyboard shortcut with:"
     puts "System Preferences -> Keyboard -> Keyboard Shortcuts -> Services -> Chupacabra"
@@ -36,7 +36,7 @@ OptionParser.new do |opts|
   end
 
   opts.on("-u", "--uninstall", "Uninstall Apple service") do |port|
-    Chupacabra::System.uninstall
+    Chupacabra::System::Install.uninstall
     puts "Service removed from #{Chupacabra::System.user_service_path}"
     exit
   end

data/lib/chupacabra.rb

@@ -1,10 +1,10 @@
-require 'chupacabra/system'
-require 'chupacabra/crypto'
-require 'chupacabra/storage'
-require 'chupacabra/version'
+require 'fileutils'
 
 module Chupacabra
   extend self
+
+  class Error < StandardError; end
+
   attr_accessor :env
   attr_accessor :log
 
@@ -30,6 +30,20 @@ module Chupacabra
     env == 'test'
   end
 
+  def root
+    Pathname.new(File.expand_path('../..', __FILE__))
+  end
+
+  def tmp_dir
+    dir = root + 'tmp'
+    dir.mkpath unless dir.exist?
+    dir
+  end
+
+  def clear_tmp
+    FileUtils.rm_rf(tmp_dir)
+  end
+
   private
 
   def output(text)
@@ -44,4 +58,12 @@ module Chupacabra
     return unless key
     "web: #{$1}" if key =~ /https?\:\/\/(?:www.)?([^\/\?]+)/
   end
-end
+end
+
+require 'chupacabra/system'
+require 'chupacabra/system/scripts'
+require 'chupacabra/system/install'
+require 'chupacabra/crypto'
+require 'chupacabra/storage'
+require 'chupacabra/version'
+require 'pathname'

data/lib/chupacabra/storage.rb

@@ -1,14 +1,32 @@
 require 'pathname'
+require 'fileutils'
 
 module Chupacabra
   class Storage
 
-    def self.filepath
-      Pathname.new(ENV['HOME']) + filename
+    class Error < Chupacabra::Error; end
+
+    def self.path
+      path = if Chupacabra.test?
+        Chupacabra.root + 'tmp' + '.chupacabra'
+      else
+        Pathname.new(ENV['HOME']) + '.chupacabra'
+      end
+      raise Error, 'Chupacabra path cant be a file' if path.file?
+      path.mkpath unless path.exist?
+      path
+    end
+
+    def self.passwords_path
+      path + 'pw'
     end
 
     def self.clear
-      filepath.unlink if filepath.exist?
+      FileUtils.rm_rf(path)
+    end
+
+    def self.version_path
+      path + 'version'
     end
 
     def initialize(password)
@@ -30,21 +48,17 @@ module Chupacabra
 
     private
 
-    def self.filename
-      Chupacabra.test? ? '.chupacabra_test' : '.chupacabra'
-    end
-
     def data
       @data ||=
-      if File.exists?(self.class.filepath)
-        Marshal.load(Crypto.decrypt(File.read(self.class.filepath), @password))
+      if File.exists?(self.class.passwords_path)
+        Marshal.load(Crypto.decrypt(File.read(self.class.passwords_path), @password))
       else
         { }
       end
     end
 
     def save
-      File.open(self.class.filepath, 'w') do |file|
+      File.open(self.class.passwords_path, 'w') do |file|
         file <<  Crypto.encrypt(Marshal.dump(@data), @password)
       end
     end

data/lib/chupacabra/system.rb

@@ -7,6 +7,20 @@ module Chupacabra
   module System
     extend self
 
+    class Error < Chupacabra::Error; end
+
+    BROWSERS = ['Google Chrome', 'Google Chrome Canary', 'Camino', 'Safari', 'Webkit', 'Opera', 'Firefox']
+
+    def execute(command, run_in_test = false)
+      log(command)
+      if Chupacabra.test? && !run_in_test
+        `echo #{command}`
+      else
+        log(command)
+        `#{command}`
+      end.strip
+    end
+
     def get_password
       return get_env_password unless get_env_password.empty?
       password = Digest::SHA1.hexdigest(get_password_from_dialog)
@@ -16,16 +30,16 @@ module Chupacabra
     end
 
     def clear
-      `launchctl unsetenv #{password_variable}` if osx?
+      System.execute("launchctl unsetenv #{password_variable}")
     end
 
     def get_clipboard
-      `pbpaste`.strip
+      System.execute("pbpaste", true).strip
     end
 
     def set_clipboard(text)
       raise 'Unsupported string' if text =~ /'/
-      `echo '#{text}' | pbcopy`
+      System.execute("echo '#{text}' | pbcopy", true)
     end
 
     def osx?
@@ -37,78 +51,24 @@ module Chupacabra
     end
 
     def front_app
-      run_script(
-        <<-EOS
-          tell application "System Events"
-            return name of first application process whose frontmost is true
-          end tell
-        EOS
-      )
+      run_script(:script => :front_app)
     end
 
     def get_browser_url
       app = front_app
-      run_script(
-        case app
-          when 'Google Chrome', 'Google Chrome Canary'
-            %Q(tell application "#{app}" to return URL of active tab of front window)
-          when 'Camino'
-            %Q(tell application "#{app}" to return URL of current tab of front browser window)
-          when 'Safari', 'Webkit', 'Opera'
-            %Q(tell application "#{app}" to return URL of front document)
-          when 'firefox'
-            <<-EOS
-              tell application "System Events"
-                keystroke "l" using command down
-                keystroke "c" using command down
-              end tell
-              delay 0.1
-              return the clipboard
-            EOS
-        end
-      )
+      return unless BROWSERS.include?(app)
+      run_script(:script => :get_browser_url, :compile_argument => app)
     end
 
     def paste_clipboard
-      run_script(%Q{tell application "System Events" to keystroke "v" using command down})
+      run_script(:script => :paste_clipboard)
     end
 
     def alert(message)
-      run_script(
-        <<-EOS
-          tell application "#{front_app}"
-            activate
-            display alert "#{message}" as warning
-          end tell
-        EOS
-      )
-    end
-
-    def install
-      user_service_contents = user_service_path + 'Contents'
-      user_service_contents.mkpath unless user_service_contents.exist?
-      chupacabra_service_contents = Pathname.new(
-        File.expand_path('../../../osx/Chupacabra.workflow/Contents', __FILE__)
-      )
-
-      %w(document.wflow Info.plist).each do |filename|
-        (user_service_contents + filename).open('w') do |file|
-          file << (chupacabra_service_contents + filename).read
-        end
-      end
+      run_script(:script => :alert, :arguments => [front_app, message])
     end
 
-    def uninstall
-      FileUtils.rm_rf user_service_path
-    end
 
-    def user_service_path
-      if Chupacabra.test?
-        Pathname.new(ENV['HOME']) + 'Library/Services/Chupacabra_test.workflow'
-      else
-        Pathname.new(ENV['HOME']) + 'Library/Services/Chupacabra.workflow'
-      end
-    end
 
     def log(message)
       return unless Chupacabra.log
@@ -120,15 +80,23 @@ module Chupacabra
     end
 
     def log_path
-      (Pathname.new(ENV['HOME']) + 'chupacabra.log')
+      if Chupacabra.test?
+        (Chupacabra.root + 'log' + 'chupacabra_test.log')
+      else
+        (Pathname.new(ENV['HOME']) + 'chupacabra.log')
+      end
     end
 
     private
 
-    def run_script(script)
-      return unless script
-      raise ArgumentError, "Script can't contain single quotes" if script =~ /'/
-      `osascript #{script.split("\n").collect{|line| " -e '#{line.strip}'"}.join}`.strip
+    def run_script(options ={})
+      return if Chupacabra.test? or !Chupacabra::System.osx?
+      script = options.fetch(:script)
+      compile_argument = options.fetch(:compile_argument, nil)
+      arguments = options.fetch(:arguments) { [] }
+      script_file = Chupacabra::System::Scripts.script_or_compile(script, compile_argument)
+      script = "osascript #{script_file} #{arguments.collect{ |arg| "'" + arg + "'" }.join(' ') }"
+      System.execute(script)
     end
 
     def password_variable
@@ -140,31 +108,20 @@ module Chupacabra
     end
 
     def strip_dialog_response(response)
-      response.match(/text returned:(.+), button returned:OK/)[1]
+      System.log(response)
+      response.match(/.class ttxt.:(.+), .class bhit.:OK/)[1]
     end
 
     def ask_for_password
-      dialog = 'display dialog "Enter Chupacabra password"' +
-        'default answer ""' +
-        'with title "Chupacabra"' +
-        'with icon caution with hidden answer'
-
-      script = <<-EOS
-        tell application "#{front_app}"
-          activate
-          #{dialog}
-        end tell
-      EOS
-
-      run_script(script)
+      run_script(:script => :ask_for_password, :arguments => [front_app])
     end
 
     def get_env_password
-      `launchctl getenv #{password_variable}`.strip
+      System.execute("launchctl getenv #{password_variable}", true).strip
     end
 
     def set_env_password(password)
-      `launchctl setenv #{password_variable} '#{password}'`
+      System.execute("launchctl setenv #{password_variable} '#{password}'", true)
     end
   end
 end

data/lib/chupacabra/system/install.rb

@@ -0,0 +1,62 @@
+module Chupacabra
+  module System
+    module Install
+      extend self
+
+      def install
+        handle_legacy_file
+        install_service
+        Chupacabra::System::Scripts.compile_all
+        update_version
+      end
+
+      def uninstall
+        FileUtils.rm_rf user_service_path
+      end
+
+      def user_service_path
+        if Chupacabra.test?
+          Chupacabra.root + 'tmp' + 'Library' + 'Services' + 'Chupacabra.workflow'
+        else
+          Pathname.new(ENV['HOME']) + 'Library/Services/Chupacabra.workflow'
+        end
+      end
+
+      private
+
+      def install_service
+        user_service_contents = user_service_path + 'Contents'
+        user_service_contents.mkpath unless user_service_contents.exist?
+        chupacabra_service_contents = Chupacabra.root + 'osx' + 'Chupacabra.workflow' + 'Contents'
+        %w(document.wflow Info.plist).each do |filename|
+          (user_service_contents + filename).open('w') do |file|
+            file << (chupacabra_service_contents + filename).read
+          end
+        end
+      end
+
+      def handle_legacy_file
+        return unless legacy_passwords_path.file?
+        legacy_passwords_path.rename(legacy_passwords_path_tmp)
+        legacy_passwords_path_tmp.rename(Chupacabra::Storage.passwords_path)
+      end
+
+      def update_version
+        Chupacabra::Storage.version_path.open('w') { |file| file << Chupacabra::VERSION }
+      end
+
+      def legacy_passwords_path
+        unless Chupacabra.test?
+          Pathname.new(ENV['HOME']) + '.chupacabra'
+        else
+          Chupacabra.tmp_dir + '.chupacabra'
+        end
+      end
+
+      def legacy_passwords_path_tmp
+        Pathname.new(legacy_passwords_path.to_s + '_tmp')
+      end
+
+    end
+  end
+end

data/lib/chupacabra/system/scripts.rb

@@ -0,0 +1,121 @@
+module Chupacabra
+  module System
+    module Scripts
+      extend self
+
+      class Error < Chupacabra::System::Error; end
+
+      def compile_all
+        scripts_path.mkpath unless scripts_path.exist?
+        clear_scripts
+        [:front_app, :paste_clipboard, :alert, :ask_for_password].each do |script|
+          compile(script)
+        end
+        Chupacabra::System::BROWSERS.each do |browser|
+          compile(:get_browser_url, browser)
+        end
+      end
+
+      def compile(script, argument = nil)
+        script_body = self.send(*[script, argument].compact)
+        raise Error, 'Empty script to compile' if script_body.empty?
+        output = System.execute "osacompile -e '#{script_body}' -o #{script_file(script, argument)}"
+        if $?.success?
+          output
+        else
+          puts "Failed to compile: #{script_file(script, argument)}"
+          puts output
+          nil
+        end
+      end
+
+      def script_or_compile(script, argument = nil)
+        file = script_file(script, argument)
+        return file if File.exist?(file)
+        compile(script, argument) or raise "Can't compile #{script}#{' with argument ' + argument if argument}"
+        file
+      end
+
+      private
+
+      def front_app
+        <<-SCPT
+          tell application "System Events"
+            return name of first application process whose frontmost is true
+          end tell
+        SCPT
+      end
+
+      def get_browser_url(app)
+        return unless BROWSERS.include?(app)
+        case app
+          when 'Google Chrome', 'Google Chrome Canary'
+            %Q(tell application "#{app}" to return URL of active tab of front window)
+          when 'Camino'
+            %Q(tell application "#{app}" to return URL of current tab of front browser window)
+          when 'Safari', 'Webkit', 'Opera'
+            %Q(tell application "#{app}" to return URL of front document)
+          when 'Firefox'
+            <<-EOS
+             tell application "System Events"
+               keystroke "l" using command down
+               keystroke "c" using command down
+             end tell
+             delay 0.1
+             return the clipboard
+           EOS
+          else
+            raise Error, "Uknown browser: #{app}"
+        end
+      end
+
+
+      def paste_clipboard
+        <<-SCPT
+          tell application "System Events" to keystroke "v" using command down
+        SCPT
+      end
+
+      # Script requires two arguments: application name, message
+      def alert
+        <<-SCPT
+          on run argv
+            set _application to item 1 of argv
+            set _message to item 2 of argv
+            tell application _application
+              activate
+              display alert _message as warning
+            end tell
+          end run
+        SCPT
+      end
+
+      # Script requires argument: application name
+      def ask_for_password
+        <<-SCPT
+          on run argv
+            set _application to item 1 of argv
+            tell application _application
+              activate
+              display dialog "Enter Chupacabra password" default answer "" with title "Chupacabra password" with icon caution with hidden answer
+            end tell
+          end run
+        SCPT
+      end
+
+      def script_file(script, argument = nil)
+        argument = '_' + argument.downcase.gsub(/ /, '_') if argument
+        scripts_path + "#{script}#{argument}.scpt"
+      end
+
+      def scripts_path
+        Chupacabra::Storage.path + 'apple_scripts'
+      end
+
+      def clear_scripts
+        Dir.glob(scripts_path + '*').each{ |file| Pathname.new(file).delete }
+      end
+    end
+  end
+end
+

data/lib/chupacabra/version.rb

@@ -1,3 +1,3 @@
 module Chupacabra
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

data/lib/tasks/compile.rake

@@ -0,0 +1,5 @@
+desc 'Compile AppleScripts'
+task :compile do
+  require 'chupacabra'
+  Chupacabra::System::Scripts.compile_all
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chupacabra
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Dawid Sklodowski
@@ -62,9 +62,12 @@ files:
 - bin/chupacabra
 - lib/chupacabra/crypto.rb
 - lib/chupacabra/storage.rb
+- lib/chupacabra/system/install.rb
+- lib/chupacabra/system/scripts.rb
 - lib/chupacabra/system.rb
 - lib/chupacabra/version.rb
 - lib/chupacabra.rb
+- lib/tasks/compile.rake
 - osx/Chupacabra.workflow/Contents/document.wflow
 - osx/Chupacabra.workflow/Contents/Info.plist
 homepage: http://github.com/dawid-sklodowski/chupacabra