Update Ruby build for command-line app

fredericblaison · May 13, 2017 · aa2b032 · aa2b032
1 parent ae4e72a
commit aa2b032
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Ruby/Rakefile b/Ruby/Rakefile
@@ -28,11 +28,11 @@ task :update_build do
   mkdir 'vendor'
 
   sh "unzip -o -d vendor #{zipfile}"
-  mv "vendor/#{filename}", 'vendor/terminal-notifier'
+  mv "vendor/#{filename}", 'vendor/terminal-notifier-src'
 
   sh 'cd .. && xcodebuild -target terminal-notifier SYMROOT=build -verbose && cd -'
-  mv '../build/Release/terminal-notifier.app', 'vendor/terminal-notifier/'
-  chmod 0755, 'vendor/terminal-notifier/terminal-notifier.app/Contents/MacOS/terminal-notifier'
+  mv '../build/Release/terminal-notifier', 'vendor'
+  chmod 0755, 'vendor/terminal-notifier'
 end
 
 desc 'Build gem'

diff --git a/Ruby/lib/terminal-notifier.rb b/Ruby/lib/terminal-notifier.rb
@@ -1,8 +1,9 @@
+# coding: utf-8
 require 'shellwords'
 require 'rbconfig'
 
 module TerminalNotifier
-  BIN_PATH = File.expand_path('../../vendor/terminal-notifier/terminal-notifier.app/Contents/MacOS/terminal-notifier', __FILE__)
+  BIN_PATH = File.expand_path('../../vendor/terminal-notifier', __FILE__)
 
   class UnsupportedPlatformError < StandardError; end
   # Returns wether or not the current platform is Mac OS X 10.10, or higher.

diff --git a/Ruby/terminal-notifier.gemspec b/Ruby/terminal-notifier.gemspec
@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-plist = File.expand_path('../../Terminal Notifier/Terminal Notifier-Info.plist', __FILE__)
+plist = File.expand_path('../../Terminal Notifier/Info.plist', __FILE__)
 # Also run on non-OSX machines, otherwise bundle installs directly from the repo will fail.
 # version = `/usr/libexec/PlistBuddy -c 'Print :CFBundleShortVersionString' '#{plist}'`.strip
 version = File.read(plist).match(%r{<string>(\d+\.\d+\.\d+)</string>})[1]
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.license          = 'MIT'
 
   gem.executables      = ['terminal-notifier']
-  gem.files            = ['bin/terminal-notifier', 'lib/terminal-notifier.rb'] + Dir.glob('vendor/terminal-notifier/**/*')
+  gem.files            = ['bin/terminal-notifier', 'lib/terminal-notifier.rb', 'vendor/terminal-notifier']
   gem.require_paths    = ['lib']
 
   gem.extra_rdoc_files = ['README.markdown']