imessage 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 719afa93b7a4faddb701be1378360054ee6cc3f8
-  data.tar.gz: 0b1bcc95053547eb357114164f94f90a0fc4181e
+  metadata.gz: f347abd1cf7c3ed181adce4ce1106fc6ff423a0f
+  data.tar.gz: 0a7021ff287bac344c360bdf038247ae6285fb4e
 SHA512:
-  metadata.gz: 5806aa4ccb91ee8ca67666cad3d7ee74e9de5649d58875dc3198d14ad29e89a422a537f4fd13ab47a845476a2f76f6e0fcf612877be3e6bbf6a6f4425cca9015
-  data.tar.gz: 6e2ad71c81fb861dd07b971c8359a2a9e03d9a94e076aec159580b3be0cb03d5a0ae14c5fcd6fac79524c565356be3a54cb4afbcf82ccd0bc077185f9f5e582a
+  metadata.gz: 92d19e5cd27006f4d2806163a1ed942161da786927311d9daa9b00a99388871dce57c3d01a87fa6fd7de73d0efdf15a797e40b1ae32eaaf333ec506cb61f1c31
+  data.tar.gz: 82aa289b2706f74d2c2318b112c63a1c28828b170c409f7705148ba61ef48c39bb1bc2c4024fd9df23560d5c82f8416660f960d3989935b3889dbf15ca920dfb

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 script: "bundle exec rake -f Rakefile.dev"
 rvm:
+  - 1.9.2
+  - 1.9.3
   - 2.0.0
   - ruby-head
 

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## [v0.3.0](https://github.com/linjunpop/imessage/tree/v0.3.0)
+
+* Raise error if no contacts specified.
+* Update project structure for better development experience.
+* Fixes typo in help message [@bfontaine](https://github.com/bfontaine)
+
 ## [v0.2.0](https://github.com/linjunpop/imessage/tree/v0.2.0)
 
 * Make it possible to run imessage standalone.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Jun Lin
+Copyright (c) 2015 Jun Lin
 
 MIT License
 

data/README.md

@@ -9,6 +9,12 @@ Command line tool to send iMessage.
 
 ## Installation
 
+### As a Homebrew(http://brew.sh) package
+
+    $ brew install imessage-ruby
+
+### As a gem
+
 Add this line to your application's Gemfile:
 
     gem 'imessage'
@@ -29,7 +35,7 @@ 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
+    -c, --contacts x,y,z             Deliver message to these CONTACTS
 
 Common options:
     -h, --help                       Prints this help
@@ -44,11 +50,13 @@ $ imessage --text "hello" --contacts "foo@example.com" --attachment 'bar.png'
 
 ## [Changelog](CHANGELOG.md)
 
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+Bug reports and pull requests are welcome on GitHub at https://github.com/linjunpop/imessage.
 

data/Rakefile

@@ -1,27 +1,36 @@
-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."
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
-    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")
+RSpec::Core::RakeTask.new(:spec)
 
-    f.puts File.read("bin/imessage")
-      .gsub(/^require_relative.*\n/, '')
-      .gsub(%r{#!/usr/bin/env ruby}, '')
+namespace :standalone do
+  desc "Build standalone version of imessage"
+  task :build 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:build`"
+      f.puts "# any changes will be overwritten."
+
+      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")
+
+      f.puts File.read("exe/imessage")
+        .gsub(/^require_relative.*\n/, '')
+        .gsub(%r{#!/usr/bin/env ruby}, '')
+    end
+    sh 'chmod +x build/imessage'
   end
-  sh 'chmod +x build/imessage'
-end
 
-desc "Install standalone script"
-task :install => :standalone do
-  prefix = ENV['PREFIX'] || ENV['prefix'] || '/usr/local'
+  desc "Install standalone script"
+  task :install => :build do
+    prefix = ENV['PREFIX'] || ENV['prefix'] || '/usr/local'
+
+    FileUtils.mkdir_p "#{prefix}/bin"
+    FileUtils.cp "build/imessage", "#{prefix}/bin"
+  end
+end
 
-  FileUtils.mkdir_p "#{prefix}/bin"
-  FileUtils.cp "build/imessage", "#{prefix}/bin"
-end
+task default: :spec

data/bin/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "imessage"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+require "pry"
+Pry.start
+
+# require "irb"
+# IRB.start
+

data/bin/setup

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here
+

data/imessage.gemspec

@@ -8,18 +8,20 @@ Gem::Specification.new do |spec|
   spec.version       = Imessage::VERSION
   spec.authors       = ["Jun Lin"]
   spec.email         = ["linjunpop@gmail.com"]
-  spec.description   = "Command line tool to send iMessage."
+
   spec.summary       = "Command line tool to send iMessage."
+  spec.description   = "Command line tool to send iMessage."
   spec.homepage      = "https://github.com/linjunpop/imessage"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", '~> 2.14'
+  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", '~> 3.3'
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-doc"
 end

data/lib/imessage/parser.rb

@@ -37,7 +37,7 @@ module Imessage
             end
           end
 
-          opts.on("-c", "--contacts x,y,z", Array, "Develier message to these CONTACTS") do |contacts|
+          opts.on("-c", "--contacts x,y,z", Array, "Deliver message to these CONTACTS") do |contacts|
             args.contacts = contacts
           end
 

data/lib/imessage/sender.rb

@@ -1,6 +1,14 @@
 module Imessage
   class Sender
     def deliver(options = {text:nil, attachment:nil, contacts: []})
+      if options[:text].nil? && options[:attachment].nil?
+        raise "You must specific at least a text or attachment."
+      end
+
+      if options[:contacts].empty?
+        raise "You must specific at least one contact"
+      end
+
       options[:contacts].each do |contact|
         _deliver(options[:text], options[:attachment], contact)
       end
@@ -9,38 +17,51 @@ module Imessage
     private
 
     def _deliver(text, attachment, contact)
-      unless text.nil?
-        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}'`
+      if text && attachment
+        deliver_text_and_attachment(text, attachment, contact)
+      elsif text
+        deliver_text(text, contact)
+      elsif attachment
+        deliver_attachment(attachment, contact)
       end
+    end
 
-      unless attachment.nil?
-        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
+    def deliver_text_and_attachment(text, attachment, contact)
+      deliver_text(text, contact)
+      deliver_attachment(attachment, contact)
+    end
+
+    def deliver_attachment(attachment, contact)
+      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
+
+    def deliver_text(text, contact)
+      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
   end
 end

data/lib/imessage/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imessage
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jun Lin
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Command line tool to send iMessage.
 email:
 - linjunpop@gmail.com
@@ -82,14 +96,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- Rakefile.dev
-- bin/imessage
+- bin/console
+- bin/setup
+- exe/imessage
 - imessage.gemspec
 - lib/imessage.rb
 - lib/imessage/parser.rb
 - lib/imessage/sender.rb
 - lib/imessage/version.rb
-- spec/spec_helper.rb
 homepage: https://github.com/linjunpop/imessage
 licenses:
 - MIT
@@ -110,10 +124,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Command line tool to send iMessage.
-test_files:
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: 

data/Rakefile.dev

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

data/spec/spec_helper.rb

@@ -1,3 +0,0 @@
-require 'rspec/autorun'
-require 'imessage'
-