clickatell 0.7.0 → 0.7.1

data/.gitignore

@@ -0,0 +1,6 @@
+doc/*
+website/*
+pkg/*
+.specification
+pkg
+rdoc

data/History.txt

@@ -1,3 +1,7 @@
+== 0.7.1
+
+* Fixed broken -b (balance) command
+
 == 0.7.0
 
 * Added support for sending SMS to multiple recipients.

data/Rakefile

@@ -0,0 +1,95 @@
+require "rubygems"
+require "rake/rdoctask"
+require File.join(File.dirname(__FILE__), *%w[lib clickatell version])
+
+begin
+  require 'jeweler'
+  
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "clickatell"
+    gemspec.summary = "Ruby interface to the Clickatell SMS gateway service."
+    gemspec.email = "luke@lukeredpath.co.uk"
+    gemspec.homepage = "http://clickatell.rubyforge.org"
+    gemspec.authors = ["Luke Redpath"]
+    gemspec.executables = %w{sms}
+    gemspec.extra_rdoc_files = %w{RDOC_README.txt History.txt License.txt}
+    gemspec.has_rdoc = true
+    gemspec.rdoc_options = %w{--main RDOC_README.txt}
+    gemspec.version = Clickatell::VERSION
+  end
+  
+  Jeweler::GemcutterTasks.new
+  
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
+end
+
+task :default => :spec
+
+require "spec"
+require "spec/rake/spectask"
+
+Spec::Rake::SpecTask.new do |t|
+  t.spec_opts = %w(--format specdoc --colour)
+  t.libs = ["spec"]
+end
+
+Spec::Rake::SpecTask.new("spec_html") do |t|
+  t.spec_opts = %w(--format html)
+  t.libs = ["spec"]
+end
+
+# Rake::RDocTask.new do |rd|
+#   rd.main = "RDOC_README.txt"
+#   rd.rdoc_files.include("lib/**/*.rb", *$gemspec.extra_rdoc_files)
+#   rd.rdoc_dir = "rdoc"
+# end
+
+desc 'Generate website files'
+task :website do
+  Dir['website/**/*.txt'].each do |txt|
+    sh %{ ruby scripts/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
+  end
+  sh "rake -s spec_html > website/specs.html"
+end
+
+desc 'Clear out RDoc and generated packages'
+task :clean => [:clobber_rdoc, :clobber_package]
+
+begin
+  require "rake/contrib/sshpublisher"
+  namespace :rubyforge do
+    
+    desc "Release gem and RDoc documentation to RubyForge"
+    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
+    
+    namespace :release do
+      desc "Release a new version of this gem"
+      task :gem => [:package] do
+        require 'rubyforge'
+        rubyforge = RubyForge.new
+        rubyforge.configure
+        rubyforge.login
+        rubyforge.userconfig['release_notes'] = $gemspec.summary
+        path_to_gem = File.join(File.dirname(__FILE__), "pkg", "#{$gemspec.name}-#{$gemspec.version}.gem")
+        puts "Publishing #{$gemspec.name}-#{$gemspec.version.to_s} to Rubyforge..."
+        rubyforge.add_release($gemspec.rubyforge_project, $gemspec.name, $gemspec.version.to_s, path_to_gem)
+      end
+    
+      desc "Publish RDoc to RubyForge."
+      task :docs => [:rdoc, :website] do
+        config = YAML.load(
+            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+        )
+ 
+        host = "#{config['username']}@rubyforge.org"
+        remote_dir = "/var/www/gforge-projects/clickatell/" 
+ 
+        Rake::SshDirPublisher.new(host, remote_dir, 'website').upload
+        Rake::SshDirPublisher.new(host, File.join(remote_dir, 'rdoc'), 'rdoc').upload
+      end
+    end
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end

data/lib/clickatell/utility/options.rb

@@ -6,7 +6,7 @@ module Clickatell
     class Options #:nodoc:
       class << self
         
-        def parse(args)
+        def parse(args)          
           @options = self.default_options
           parser = OptionParser.new do |opts|
             opts.banner = "Usage: sms [options] recipient(s) message"
@@ -64,18 +64,17 @@ module Clickatell
               exit
             end
           end
-        
+          
+          @options.recipient = args[-2].split(',') rescue nil
+          @options.message   = args[-1]
+          
           parser.parse!(args)
-          @options.recipient = ARGV[-2]
-          @options.message   = ARGV[-1]
         
           if (@options.message.nil? || @options.recipient.nil?) && send_message?
             puts "You must specify a recipient and message!"
             puts parser
             exit
           end
-          
-          @options.recipient = @options.recipient.split(",")
 
           return @options
         

data/lib/clickatell/version.rb

@@ -2,7 +2,7 @@ module Clickatell #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 7
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
     

data/scripts/txt2html

@@ -0,0 +1,67 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'redcloth'
+require 'syntax/convertors/html'
+require 'erb'
+require File.dirname(__FILE__) + '/../lib/clickatell/version.rb'
+
+version  = Clickatell::VERSION::STRING
+download = 'http://rubyforge.org/projects/clickatell'
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1: return 'st'
+    when 2: return 'nd'
+    when 3: return 'rd'
+    else    return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= File.dirname(__FILE__) + '/../website/template.rhtml'
+  
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body_text = fsrc.read
+  syntax_items = []
+  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</
>!m){
+    ident = syntax_items.length
+    element, syntax, source = $1, $2, $3
+    syntax_items << "<#{element} class='syntax'>#{convert_syntax(syntax, source)}</#{element}>"
+    "syntax-temp-#{ident}"
+  }
+  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
+  body = RedCloth.new(body_text).to_html
+  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
+end
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)

data/spec/cli_options_test.rb

@@ -0,0 +1,26 @@
+require 'test/unit'
+require 'shoulda'
+require File.join(File.dirname(__FILE__), *%w[.. lib clickatell utility])
+
+class CliOptionsTest < Test::Unit::TestCase
+  
+  context "Sending a message" do
+    should "allow single recipients" do
+      options = Clickatell::Utility::Options.parse(%w{07944123456 testing})
+      assert_equal %w{07944123456}, options.recipient
+    end
+    
+    should "allow multiple, comma-separated recipients" do
+      options = Clickatell::Utility::Options.parse(%w{07944123456,07944123457 testing})
+      assert_equal %w{07944123456 07944123457}, options.recipient
+    end
+  end
+  
+  context "Checking balance" do
+    should "not require a recipient" do
+      options = Clickatell::Utility::Options.parse(%w{-b})
+      assert_nil options.recipient
+    end  
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clickatell
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Luke Redpath
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 +01:00
+date: 2009-12-01 00:00:00 +00:00
 default_executable: sms
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+dependencies: []
+
 description: 
 email: luke@lukeredpath.co.uk
 executables: 
@@ -29,32 +20,45 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- RDOC_README.txt
 - History.txt
 - License.txt
+- RDOC_README.txt
 files: 
+- .gitignore
 - History.txt
 - License.txt
 - RDOC_README.txt
 - README.textile
+- Rakefile
 - bin/sms
-- spec/api_spec.rb
-- spec/command_executor_spec.rb
-- spec/hash_ext_spec.rb
-- spec/response_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+- lib/clickatell.rb
+- lib/clickatell/api.rb
 - lib/clickatell/api/command.rb
 - lib/clickatell/api/command_executor.rb
 - lib/clickatell/api/error.rb
 - lib/clickatell/api/message_status.rb
-- lib/clickatell/api.rb
 - lib/clickatell/response.rb
-- lib/clickatell/utility/options.rb
 - lib/clickatell/utility.rb
+- lib/clickatell/utility/options.rb
 - lib/clickatell/version.rb
-- lib/clickatell.rb
 - lib/core-ext/hash.rb
+- scripts/txt2html
+- spec/api_spec.rb
+- spec/cli_options_test.rb
+- spec/command_executor_spec.rb
+- spec/hash_ext_spec.rb
+- spec/response_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- website/images/footer_bg.gif
+- website/index.txt
+- website/javascripts/codehighlighter/code_highlighter.js
+- website/javascripts/codehighlighter/ruby.js
+- website/javascripts/rounded_corners_lite.inc.js
+- website/stylesheets/limechoc.css
+- website/stylesheets/rdoc.css
+- website/stylesheets/screen.css
+- website/template.rhtml
 has_rdoc: true
 homepage: http://clickatell.rubyforge.org
 licenses: []
@@ -79,10 +83,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: clickatell
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby interface to the Clickatell SMS gateway service.
-test_files: []
-
+test_files: 
+- spec/api_spec.rb
+- spec/cli_options_test.rb
+- spec/command_executor_spec.rb
+- spec/hash_ext_spec.rb
+- spec/response_spec.rb
+- spec/spec_helper.rb