imessage 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daf8c0ba467145de9550f33f588536ccd42ebcbf
-  data.tar.gz: 9c1ebbeb7170042fef1131c1ddb8ef8d990d6a08
+  metadata.gz: 719afa93b7a4faddb701be1378360054ee6cc3f8
+  data.tar.gz: 0b1bcc95053547eb357114164f94f90a0fc4181e
 SHA512:
-  metadata.gz: 38497957a3158ab72cf337a651a448fb7126b4814d9362cf5748b5e105bd2c0a9680a1199414a79c4da7f541775ca1dbf1f8edf53ae0c6dbfb91539f8deea3a4
-  data.tar.gz: cb885e1137527cae11ec475e30930e785e820bed279bafe0fcfba497508cdd5e56425bf5d0882896f945ba880259ce4365613c5fffad30e674783db4db6b1876
+  metadata.gz: 5806aa4ccb91ee8ca67666cad3d7ee74e9de5649d58875dc3198d14ad29e89a422a537f4fd13ab47a845476a2f76f6e0fcf612877be3e6bbf6a6f4425cca9015
+  data.tar.gz: 6e2ad71c81fb861dd07b971c8359a2a9e03d9a94e076aec159580b3be0cb03d5a0ae14c5fcd6fac79524c565356be3a54cb4afbcf82ccd0bc077185f9f5e582a

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+build

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-script: "bundle exec rspec spec"
+script: "bundle exec rake -f Rakefile.dev"
 rvm:
   - 2.0.0
   - ruby-head

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## [v0.2.0](https://github.com/linjunpop/imessage/tree/v0.2.0)
+
+* Make it possible to run imessage standalone.
+
 ## [v0.1.1](https://github.com/linjunpop/imessage/tree/v0.1.1)
 
 * Fixes fail to send messages without attachment. [#3](https://github.com/linjunpop/imessage/issues/3)
@@ -17,4 +21,3 @@
 ## [v0.0.1](https://github.com/linjunpop/imessage/tree/v0.0.1)
 
 * Implement send iMessage.
-

data/README.md

@@ -23,8 +23,23 @@ Or install it yourself as:
 
 ## Usage
 
+```shell
+Usage: imessage [options]
+
+Specific options:
+    -t, --text [TEXT]                The TEXT to deliver
+    -a, --attachment [ATTACHMENT]    Add an attachment
+    -c, --contacts x,y,z             Develier message to these CONTACTS
+
+Common options:
+    -h, --help                       Prints this help
+        --version                    Show version
+```
+
+## Example
+
 ```
-$ imessage send "hello" --to "foo@example.com" --attachment 'bar.png'
+$ imessage --text "hello" --contacts "foo@example.com" --attachment 'bar.png'
 ```
 
 ## [Changelog](CHANGELOG.md)

data/Rakefile

@@ -1,7 +1,27 @@
-require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+desc "Build standalone version of imessage"
+task :standalone do
+  mkdir_p "build"
+  File.open("build/imessage", "w") do |f|
+    f.puts "#!/usr/bin/env ruby"
+    f.puts "# This file is generated from https://github.com/linjunpop/imessage using `rake standalone`"
+    f.puts "# any changes will be overwritten."
 
-RSpec::Core::RakeTask.new(:spec)
+    f.puts File.read("lib/imessage.rb").gsub(/^require_relative.*\n/, '')
+    f.puts File.read("lib/imessage/version.rb")
+    f.puts File.read("lib/imessage/parser.rb")
+    f.puts File.read("lib/imessage/sender.rb")
 
-task default: :spec
+    f.puts File.read("bin/imessage")
+      .gsub(/^require_relative.*\n/, '')
+      .gsub(%r{#!/usr/bin/env ruby}, '')
+  end
+  sh 'chmod +x build/imessage'
+end
 
+desc "Install standalone script"
+task :install => :standalone do
+  prefix = ENV['PREFIX'] || ENV['prefix'] || '/usr/local'
+
+  FileUtils.mkdir_p "#{prefix}/bin"
+  FileUtils.cp "build/imessage", "#{prefix}/bin"
+end

data/Rakefile.dev

@@ -0,0 +1,6 @@
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/bin/imessage

@@ -1,58 +1,14 @@
 #!/usr/bin/env ruby
-require 'gli'
-require 'imessage'
 
-include GLI::App
+require_relative '../lib/imessage'
 
-program_desc 'Command line tool to send iMessage.'
+ARGV << '--help' if ARGV.empty?
 
-version Imessage::VERSION
+options = Imessage::Parser.parse(ARGV)
 
-desc 'Send iMessage'
-long_desc <<-EOS
-Example: $ imessage send "hello" --to "foo@example.com" --attachment 'oh.png'
-EOS
-
-command :send do |c|
-  c.desc 'Contacts'
-  c.flag [:to, :contacts], type: Array
-  c.flag [:a, :attachment], type: String
-
-  c.action do |global_options, options, args|
-    help_now!('Message or Attachment is required') if !options[:attachment] && args.empty?
-    help_now!('Contacts is required') unless options[:contacts]
-
-    if attachment = options[:attachment]
-      if File.exists?(attachment)
-        attachment = File.expand_path(attachment)
-      else
-        exit_now!("Can not find file #{attachment}")
-      end
-    end
-
-    sender = Imessage::Sender.new
-    sender.deliver(
-      text: args.first,
-      attachment: attachment,
-      contacts: options[:contacts]
-    )
-  end
-end
-
-pre do |global,command,options,args|
-  true
-end
-
-post do |global,command,options,args|
-  # Post logic here
-  # Use skips_post before a command to skip this
-  # block on that command only
-end
-
-on_error do |exception|
-  # Error logic here
-  # return false to skip default error handling
-  true
-end
-
-exit run(ARGV)
+sender = Imessage::Sender.new
+sender.deliver({
+  text: options.text,
+  attachment: options.attachment,
+  contacts: options.contacts
+})

data/imessage.gemspec

@@ -21,6 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", '~> 2.14'
-
-  spec.add_runtime_dependency 'gli','~> 2.8.1'
+  spec.add_development_dependency "pry"
 end

data/lib/imessage.rb

@@ -1,5 +1,6 @@
-require 'imessage/version'
-require 'imessage/sender'
+require_relative 'imessage/version'
+require_relative 'imessage/parser'
+require_relative 'imessage/sender'
 
 module Imessage
 end

data/lib/imessage/parser.rb

@@ -0,0 +1,60 @@
+require 'optparse'
+require 'ostruct'
+
+module Imessage
+  class Parser
+    class << self
+      def parse(options)
+        OpenStruct.new.tap do |args|
+          args.contacts = []
+          args.text = nil
+          args.attachment = nil
+          args.verbose = false
+
+          opt_parser(args).parse!(options)
+        end
+      end
+
+      private
+
+      def opt_parser(args)
+        OptionParser.new do |opts|
+          opts.banner = "Usage: imessage [options]"
+
+          opts.separator ""
+          opts.separator "Specific options:"
+
+          opts.on("-t", "--text [TEXT]", String, "The TEXT to deliver") do |text|
+            args.text = text
+          end
+
+          opts.on("-a", "--attachment [ATTACHMENT]", String, "Add an attachment") do |attachment|
+            if File.exists?(attachment)
+              args.attachment = File.expand_path(attachment)
+            else
+              puts "Can not find file #{attachment}"
+              exit(1)
+            end
+          end
+
+          opts.on("-c", "--contacts x,y,z", Array, "Develier message to these CONTACTS") do |contacts|
+            args.contacts = contacts
+          end
+
+          opts.separator ""
+          opts.separator "Common options:"
+
+          opts.on("-h", "--help", "Prints this help") do
+            puts opts
+            exit
+          end
+
+          opts.on_tail("--version", "Show version") do
+            puts "imessage v#{Imessage::VERSION}"
+            exit
+          end
+        end
+      end
+    end
+  end
+end

data/lib/imessage/sender.rb

@@ -1,7 +1,5 @@
 module Imessage
   class Sender
-    TYPES = [:text, :attachment]
-
     def deliver(options = {text:nil, attachment:nil, contacts: []})
       options[:contacts].each do |contact|
         _deliver(options[:text], options[:attachment], contact)
@@ -12,13 +10,36 @@ module Imessage
 
     def _deliver(text, attachment, contact)
       unless text.nil?
-        apple_script_file = File.join(File.dirname(File.expand_path(__FILE__)), 'scripts/send_text.applescript')
-        `osascript #{apple_script_file} '#{contact}' '#{text}'`
+        script = <<-SCRIPT
+        on run argv
+                set toAddress to first item of argv
+                set message to second item of argv
+                tell application "Messages"
+                        send message to buddy toAddress of (service 1 whose service type is iMessage)
+                end tell
+        end run
+        SCRIPT
+        `osascript -e '#{script}' '#{contact}' '#{text}'`
       end
 
       unless attachment.nil?
-        apple_script_file = File.join(File.dirname(File.expand_path(__FILE__)), 'scripts/send_attachment.applescript')
-        `osascript #{apple_script_file} '#{contact}' '#{attachment}'`
+        script = <<-SCRIPT
+        on run argv
+                set toAddress to first item of argv
+                set theFilePath to second item of argv
+                set theFile to POSIX file theFilePath
+                tell application "System Events"
+                        if exists file theFilePath then
+                                tell application "Messages"
+                                        send theFile to buddy toAddress of (service 1 whose service type is iMessage)
+                                end tell
+                        else
+                                error "File not exist."
+                        end if
+                end tell
+        end run
+        SCRIPT
+        `osascript -e'#{script}' '#{contact}' '#{attachment}'`
       end
     end
   end

data/lib/imessage/version.rb

@@ -1,3 +1,3 @@
 module Imessage
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imessage
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jun Lin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-05 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '0'
 description: Command line tool to send iMessage.
 email:
 - linjunpop@gmail.com
@@ -82,11 +82,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Rakefile.dev
 - bin/imessage
 - imessage.gemspec
 - lib/imessage.rb
-- lib/imessage/scripts/send_attachment.applescript
-- lib/imessage/scripts/send_text.applescript
+- lib/imessage/parser.rb
 - lib/imessage/sender.rb
 - lib/imessage/version.rb
 - spec/spec_helper.rb
@@ -116,3 +116,4 @@ specification_version: 4
 summary: Command line tool to send iMessage.
 test_files:
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/imessage/scripts/send_attachment.applescript

@@ -1,15 +0,0 @@
-on run argv
-	set toAddress to first item of argv
-	set theFilePath to second item of argv
-	set theFile to POSIX file theFilePath
-	
-	tell application "System Events"
-		if exists file theFilePath then
-			tell application "Messages"
-				send theFile to buddy toAddress of (service 1 whose service type is iMessage)
-			end tell
-		else
-			error "File not exist."
-		end if
-	end tell
-end run

data/lib/imessage/scripts/send_text.applescript

@@ -1,7 +0,0 @@
-on run argv
-	set toAddress to first item of argv
-	set message to second item of argv
-	tell application "Messages"
-		send message to buddy toAddress of (service 1 whose service type is iMessage)
-	end tell
-end run