madrox 0.1.0 → 0.1.1

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -0,0 +1,17 @@
+PATH
+  remote: .
+  specs:
+    madrox (0.1.0)
+      yajl-ruby (~> 0.7.7)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    yajl-ruby (0.7.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  madrox!
+  yajl-ruby (~> 0.7.7)

data/README.md

@@ -45,6 +45,12 @@ them locally.
     @bob: @rick: sup?
     @rick: Hi
 
+## TODO
+
+* Twitter pushing support
+* Git Notes for Twitter (or other) metadata.
+* Better importing.
+
 ## Requirements
 
 gem install grit

data/bin/madrox

@@ -5,6 +5,9 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 require 'optparse'
 require 'rubygems'
 require 'madrox'
+require 'open-uri'
+require 'time'
+require 'yajl'
 
 help = <<HELP
 Madrox is a distributed Twitter implementation on Git.
@@ -32,6 +35,18 @@ opts = OptionParser.new do |opts|
     options[:msg] = msg
   end
 
+  opts.on('--import [name]', "Import from external service (twitter)") do |name|
+    options[:import] = name.to_sym
+  end
+
+  opts.on('--since-id [ID]', "Oldest Twitter ID to import") do |id|
+    options[:since_id] = id
+  end
+  
+  opts.on('--max-id [ID]', "Newest Twitter ID to import") do |id|
+    options[:max_id] = id
+  end
+
   opts.on('--irb', "Loads an IRB session") do 
     options[:irb] = true
   end
@@ -88,8 +103,36 @@ if options[:irb]
 
   puts "Loaded Madrox wiki at #{File.expand_path(m_path).inspect}."
   IRB.start_session(binding)
-else
-  timeline.messages.each do |commit|
-    puts "[#{commit.committed_date}] @#{commit.author.name}: #{commit.message}"
+else 
+  case options[:import]
+    when :twitter
+      puts "Importing tweets from Twitter..."
+      page   = 1
+      result = []
+      tweets = []
+      url    = "http://api.twitter.com/1/statuses/user_timeline.json?screen_name=#{timeline.user}&trim_user=1&count=200"
+      if options[:since_id]
+        url << "&since_id=#{options[:since_id]}"
+      end
+      if options[:max_id]
+        url << "&max_id=#{options[:max_id]}"
+      end
+      until page > 1 && result.empty?
+        open("#{url}&page=#{page}") do |f|
+          page  += 1
+          result = Yajl::Parser.parse(f.read)
+          tweets.push *result if !result.empty?
+        end
+      end
+      puts "Importing #{tweets.size} tweets..."
+      tweets.reverse!
+      tweets.each_with_index do |tweet, idx|
+        puts tweet['id'] if (idx + 1) % 100 == 0
+        timeline.post(tweet['text'], :committed_date => Time.parse(tweet['created_at']))
+      end
+    else # no importer, just list their tweets
+      timeline.messages.each do |commit|
+        puts "[#{commit.committed_date}] @#{commit.author.name}: #{commit.message}"
+      end
   end
 end

data/lib/madrox.rb

@@ -1,5 +1,5 @@
 module Madrox
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'grit', 'lib')

data/madrox.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'madrox'
-  s.version           = '0.1.0'
-  s.date              = '2010-10-22'
+  s.version           = '0.1.1'
+  s.date              = '2010-10-23'
   s.rubyforge_project = 'madrox'
 
   ## Make sure your summary is short. The description may be as long
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  #s.add_dependency('DEPNAME', [">= 1.1.0", "< 2.0.0"])
+  s.add_dependency('yajl-ruby', ["~> 0.7.7"])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
@@ -50,6 +50,8 @@ Gem::Specification.new do |s|
   ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
   # = MANIFEST =
   s.files = %w[
+    Gemfile
+    Gemfile.lock
     LICENSE
     README.md
     Rakefile

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Rick Olson
@@ -14,10 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 +02:00
+date: 2010-10-23 00:00:00 +02:00
 default_executable: madrox
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 7
+        version: 0.7.7
+  type: :runtime
+  version_requirements: *id001
 description: Distributed Twitter implementation on Git.
 email: technoweenie@gmail.com
 executables: 
@@ -27,6 +41,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -1489,6 +1505,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -1496,6 +1513,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -1505,7 +1523,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: madrox
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: Distributed Twitter implementation on Git.