twog 0.2.2 → 0.3.0

data/History.rdoc

@@ -0,0 +1,39 @@
+=== Version 0.3.0 / 2010-04-10
+
+* Enhancements
+  * Added binary commands "--cronadd N" and "--cronrm" to install/remove
+  cron job that calls twog every N minutes (added dependency on whenever gem)
+  * added more options to binary commands for help and version (-?,-h,-v)
+
+=== Version 0.2.2 / 2010-04-09
+
+* Bugs
+  * fix README to reference "--conf" binary command instead of legacy rake task
+
+=== Version 0.2.1 / 2010-04-08
+
+* Features
+  * change creating of conf file to a binary option (--conf)  instead of rake task
+
+=== Version 0.2.0 / 2010-04-08
+
+* Features
+  * setup Jeweler to autogenerate gemspec file
+  * pushed gem versions to rubygems.org
+
+=== Version 0.1.0 / 2010-04-07
+
+* Features
+  * Change structure to be more rubyish (modules instead of classes)
+    Due to no state being maintained in application
+
+=== Version 0.0.1 / 2010-04-07
+
+* Features
+  * parses RSS feed
+  * tweets posts that haven't been tweeted
+    (time > blog post time in conf yaml file)
+
+=== Version 0.0.0 / 2010-03-31
+
+* Initial Commit

data/README.textile

@@ -11,25 +11,27 @@ One you have those, run the command:
 
 bq. twog --conf
 
-and a hidden configuration file will be created in the your home folder (~/.twog.yaml).  Once there, please fill it out with the information necessary to use this tool.
+and a hidden configuration file will be created in the your home folder (~/.twog/conf.yaml).  Once there, please fill it out with the information necessary to use this tool.
 
 h2. Bitly API
 
 In order to use Bitly for URL shortening, you'll need to go to http://bit.ly and click the "Sign Up":http://bit.ly/account/register?rd=/ link on the top right and get an account.  Once you are logged-in you click the "Account":http://bit.ly/account link in the same top right area.  You will see your API Key in the middle of the page.
 
-Put your bit.ly username and api key into the ~/.twog.yaml file to be used in the code.
+Put your bit.ly username and api key into the ~/.twog/conf.yaml file to be used in the code.
 
 h2. cron
 
-The idea is to setup cron to run the bin/twog script.
+To install twog as a crontab job, run the command:
 
-"Crontab HowTo":http://www.unixgeeks.org/security/newbie/unix/cron-1.html
+bq. twog --cronadd N
 
-For example, I run 'crontab -e' and this lets me edit my user's crontab file and I put the following:
+where N is the number of minutes you want twog to fire off every time.
 
-bq. */15 * * * * jmeridth twog 
+To remove twog as a crontab job, run the command:
 
-Will be wiring up the cronedit gem later
+bq. twog --cronrm
+
+"Crontab Info":http://www.unixgeeks.org/security/newbie/unix/cron-1.html for all my non-*nix bretheren.
 
 h2. TODO
 

data/Rakefile

@@ -33,13 +33,14 @@ begin
   Jeweler::Tasks.new do |s|
     s.name = "twog"
     s.summary = %Q{Tool to tweet blog posts}
-    s.email = ["jmeridth@gmail.com", "agilejoe@gmail.com"]
+    s.email = ["jmeridth@gmail.com"]
     s.homepage = "http://github.com/armmer/twog"
     s.description = "Tool to tweet blog posts"
-    s.authors = ["Jason Meridth", "Joe Ocampo"]
+    s.authors = ["Jason Meridth"]
     s.rubyforge_project = "twog"
     s.add_dependency('twitter_oauth', '>= 0.3.3')
     s.add_dependency('bitly', '>= 0.4.0')
+    s.add_dependency('whenever', '>= 0.4.1')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler --version '>= 0.11.0'"

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 2
+:patch: 0
 :major: 0
 :build: 
-:minor: 2
+:minor: 3

data/bin/twog

@@ -2,22 +2,65 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
+require 'tempfile'
 require 'twog'
 require 'optparse'
+require 'whenever'
+require 'fileutils'
+
+twog_dir = "#{ENV['HOME']}/.twog"
+FileUtils.mkdir_p twog_dir unless File.exists?(twog_dir)
+twog_cron_schedule_file = "#{twog_dir}/schedule.rb"
+twog_cron_schedule_log = "#{twog_dir}/cron.log"
+twog_cron_identifier = "twog"
+legacy_conf_file_name = "#{ENV['HOME']}/.twog.yaml"
+twog_conf_file = "#{twog_dir}/conf.yaml"
 
 options = {}
 opts = OptionParser.new do |opts|
   opts.banner = "Twog is a tool to tweet blog posts"
 
-  opts.on("--version", "Display current version") do
+  opts.on_tail("-h","-?","--help", "Display help") do
+    puts opts
+    exit 0
+  end
+
+  opts.on("-v", "--version", "Display current version") do
     puts "Twog " + Twog.version
     exit 0
   end
+
+  opts.on("--cronadd N", "Add crontab job to run twog every N minutes") do |n|
+    twog_cron_schedule_content = <<-EOS
+  set :output, "#{twog_cron_schedule_log}"
+  every #{n}.minutes do
+    command "twog"
+  end
+    EOS
+
+    answer = ""
+    if File.exists?(twog_cron_schedule_file)
+      puts "Cron schedule file (#{twog_cron_schedule_file}) already exists.  Overwrite? [Y/n]"
+      answer = gets
+    end
+ 
+    File.open(twog_cron_schedule_file, 'w') {|f| f.write(twog_cron_schedule_content) } if ["Y","y",""].include?(answer.chomp)
+
+    cron_options = {:file => twog_cron_schedule_file, :identifier => twog_cron_identifier, :update => true}
+    Whenever::CommandLine.execute(cron_options)
+    exit 0
+  end
   
+  opts.on("--cronrm", "Remove twog crontab job") do
+    File.open(twog_cron_schedule_file, 'w') {|f| f.write("") }
+    cron_options = {:file => twog_cron_schedule_file, :identifier => twog_cron_identifier, :update => true}
+    Whenever::CommandLine.execute(cron_options)
+    puts "Twog cron job removed successfully"
+    exit 0
+  end
+
   opts.on("--conf", "Create default conf file") do
-    AUTH_FILE_NAME = "#{ENV['HOME']}/.twog.yaml"
-    
-    AUTH_CONFIG_FILE = <<-EOS
+    conf_file_contents = <<-EOS
   rss_feed: 'http://url.com/feed.rss'
   consumer_key: 'consumer key'
   consumer_secret: 'consumer secret'
@@ -28,13 +71,14 @@ opts = OptionParser.new do |opts|
   last_blog_post_tweeted:
     EOS
 
-    if File.exists?(AUTH_FILE_NAME)
-      puts "#{ENV['HOME']}/.twog.yaml already exists"     
+    FileUtils.mv(legacy_conf_file_name, twog_conf_file) if File.exists?(legacy_conf_file_name)
+    if File.exists?(twog_conf_file)
+      puts "#{twog_conf_file} already exists"     
       exit 0     
     end
 
-    File.open(AUTH_FILE_NAME, 'w') {|f| f.write(AUTH_CONFIG_FILE) } 
-    puts "Default configuration file created at ~/.twog.yaml"
+    File.open(twog_conf_file, 'w') {|f| f.write(conf_file_contents) } 
+    puts "Default configuration file created at #{twog_conf_file}"
     exit 0
   end
 end
@@ -48,7 +92,7 @@ if ARGV.size > 1
   exit(1)
 end
 
-raise "please run 'twog --conf' to create the ~/.twog.yaml file" unless File.exists?("#{ENV['HOME']}/.twog.yaml")
-conf = YAML.load_file("#{ENV['HOME']}/.twog.yaml")
+raise "please run 'twog --conf' to create the #{twog_conf_file} file" unless File.exists?(twog_conf_file)
+conf = YAML.load_file(twog_conf_file)
 
 Twog.run(conf)

data/lib/twog/twitter_handler.rb

@@ -46,6 +46,6 @@ module TwitterHandler
 
   def update_config_file_with_latest_tweet_date(last_blog_post_tweeted, conf)
     conf['last_blog_post_tweeted'] = last_blog_post_tweeted
-    File.open("#{ENV['HOME']}/.twog.yaml","w") { |out| out.write(conf.to_yaml) }
+    File.open("#{ENV['HOME']}/.twog/conf.yaml","w") { |out| out.write(conf.to_yaml) }
   end
 end

data/twog.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{twog}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jason Meridth", "Joe Ocampo"]
-  s.date = %q{2010-04-08}
+  s.authors = ["Jason Meridth"]
+  s.date = %q{2010-04-10}
   s.default_executable = %q{twog}
   s.description = %q{Tool to tweet blog posts}
-  s.email = ["jmeridth@gmail.com", "agilejoe@gmail.com"]
+  s.email = ["jmeridth@gmail.com"]
   s.executables = ["twog"]
   s.extra_rdoc_files = [
     "LICENSE",
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "History.rdoc",
      "LICENSE",
      "README.textile",
      "Rakefile",
@@ -57,13 +58,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<twitter_oauth>, [">= 0.3.3"])
       s.add_runtime_dependency(%q<bitly>, [">= 0.4.0"])
+      s.add_runtime_dependency(%q<whenever>, [">= 0.4.1"])
     else
       s.add_dependency(%q<twitter_oauth>, [">= 0.3.3"])
       s.add_dependency(%q<bitly>, [">= 0.4.0"])
+      s.add_dependency(%q<whenever>, [">= 0.4.1"])
     end
   else
     s.add_dependency(%q<twitter_oauth>, [">= 0.3.3"])
     s.add_dependency(%q<bitly>, [">= 0.4.0"])
+    s.add_dependency(%q<whenever>, [">= 0.4.1"])
   end
 end
 

metadata

@@ -4,18 +4,17 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jason Meridth
-- Joe Ocampo
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -05:00
+date: 2010-04-10 00:00:00 -05:00
 default_executable: twog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,10 +45,23 @@ dependencies:
         version: 0.4.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: whenever
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 1
+        version: 0.4.1
+  type: :runtime
+  version_requirements: *id003
 description: Tool to tweet blog posts
 email: 
 - jmeridth@gmail.com
-- agilejoe@gmail.com
 executables: 
 - twog
 extensions: []
@@ -59,6 +71,7 @@ extra_rdoc_files:
 - README.textile
 files: 
 - .gitignore
+- History.rdoc
 - LICENSE
 - README.textile
 - Rakefile