pupil 0.3.3 → 0.4

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.4.0
+----------------
+
+* Added new commandline tool.
+  "Eyedrops, the interactive twitter with Pupil"
+* Pupil::Keygen are supported readline.
+
 0.3.3
 ----------------
 

data/bin/eyedrops

@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby
+
+require "pupil"
+require "pupil/keygen"
+require "yaml"
+require "fileutils"
+require "readline"
+
+class Credentials
+  attr_accessor :credentials
+
+  def initialize(file)
+    FileUtils.touch file unless FileTest.exists? file
+    @credentials_file = file
+    @credentials = YAML.load_file(file)
+  end
+
+  def save
+    YAML.dump(@credentials, File.open(@credentials_file, "w"))
+  end
+  
+  def create
+    token = Pupil::Keygen.new.interactive
+    @credentials ||= Hash.new
+    @credentials.update({token[:screen_name] => token.reject{|k, v| k == :screen_name }})
+    self.save
+    return token
+  end
+end
+
+# Initialize
+home_dir = `echo $HOME`.strip
+eyedrops_dir = File.join(home_dir, ".eyedrops")
+credentials_file = File.join(eyedrops_dir, "credentials")
+
+Dir.mkdir eyedrops_dir unless FileTest.exists? eyedrops_dir
+cred = Credentials.new(credentials_file)
+
+unless cred.credentials
+  cred.create
+end
+
+puts "Eyedrops, the interactive twitter with Pupil #{Pupil::VERSION}"
+
+num = 1
+cred.credentials.keys.each do |name|
+  puts "#{num}. #{name}"
+  num += 1
+end
+puts "#{num}. Add Account"
+sel = Readline.readline("Choose account: ", false).to_i
+if sel == cred.credentials.keys.size + 1
+  cred.create
+  sel = cred.credentials.keys.size
+end
+
+puts "Preparing Pupil instance..."
+pupil = Pupil.new(cred.credentials[cred.credentials.keys[sel-1]])
+puts "Signed with @#{cred.credentials.keys[sel-1]}"
+
+while(true)
+  begin
+    line = Readline.readline("eyedrops> ", true)
+    break if line =~ /^(exit|quit)$/
+
+    arr = line.split(" ")
+    command = arr.first
+    option  = arr[1, arr.size]
+
+    case command.to_sym
+    when :help
+      puts <<-'EOD'
+      ### External Commands ###
+      help - Now you typed it.
+      exit|quit - Exit eyedrops.
+      
+      ### Examples ###
+      eyedrops> puts pupil.profile.id
+      237079012
+      => nil
+      eyedrops> pupil.timeline :count => 5
+      #<Pupil::Status:0x007fafb34b5720>
+      #<Pupil::Status:0x007fafb34b56f8>
+      #<Pupil::Status:0x007fafb34b56d0>
+      #<Pupil::Status:0x007fafb34b56a8>
+      #<Pupil::Status:0x007fafb34b5680>
+      => nil
+      EOD
+    else
+      result = eval(line)
+      puts "=> #{result.inspect}"
+    end
+  rescue => exception
+    puts exception
+  end
+end

data/lib/pupil/keygen.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 $LOAD_PATH << File.dirname(File.expand_path(__FILE__)) if RUBY_VERSION >= "1.9.0"
+require "readline"
 require "essentials"
 require "base"
 require "keygen/base"

data/lib/pupil/keygen/base.rb

@@ -30,7 +30,7 @@ class Pupil
       return {:access_token => access_token.token, :access_token_secret => access_token.secret}
     end
     
-    def pupilkey
+    def pupil_key
       raise MissingRequiredTokens, "Pupil::Keygen#pupilkey require consumer_key, consumer_secret, access_token and access_token_secret" unless @consumer_key || @consumer_secret || @access_token || @access_token_secret
       return {
         :consumer_key => @consumer_key,
@@ -41,28 +41,23 @@ class Pupil
     end
 
     def interactive
-      print "Enter OAuth Consumer Key: " unless @consumer_key
-      @consumer_key = gets.chomp.strip unless @consumer_key
-      print "Enter OAuth Consumer Secret: " unless @consumer_secret
-      @consumer_secret = gets.chomp.strip unless @consumer_secret
+      @consumer_key = Readline.readline("Enter OAuth Consumer Key: ", true) unless @consumer_key
+      print  unless @consumer_secret
+      @consumer_secret = Readline.readline("Enter OAuth Consumer Secret: ", true) unless @consumer_secret
 
       consumer = OAuth::Consumer.new(@consumer_key, @consumer_secret, :site => 'http://twitter.com')
 
       request_token = consumer.get_request_token
 
       puts "Access to this URL and approve: #{request_token.authorize_url}"
-
-      print "Enter OAuth Verifier: "
-      oauth_verifier = gets.chomp.strip
+      
+      oauth_verifier = Readline.readline("Enter OAuth Verifier: ", true)
 
       access_token = request_token.get_access_token(:oauth_verifier => oauth_verifier)
       @access_token = access_token.token
       @access_token_secret = access_token.secret
       
-      puts "Process complete!"
-      puts "Access token: #{access_token.token}"
-      puts "Access token secret: #{access_token.secret}"
-      return {:consumer_key => @consumer_key, :consumer_secret => @consumer_secret, :access_token => access_token.token, :access_token_secret => access_token.secret}
+      return {:consumer_key => @consumer_key, :consumer_secret => @consumer_secret, :access_token => access_token.token, :access_token_secret => access_token.secret, :screen_name => access_token.params[:screen_name]}
     end
   end
 end

data/lib/pupil/version.rb

@@ -1,3 +1,3 @@
 class Pupil
-  VERSION = "0.3.3"
+  VERSION = "0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupil
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70336822437800 !ruby/object:Gem::Requirement
+  requirement: &70170194408800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336822437800
+  version_requirements: *70170194408800
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70336822437220 !ruby/object:Gem::Requirement
+  requirement: &70170194408300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336822437220
+  version_requirements: *70170194408300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70336822436600 !ruby/object:Gem::Requirement
+  requirement: &70170194407740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336822436600
+  version_requirements: *70170194407740
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70336822435980 !ruby/object:Gem::Requirement
+  requirement: &70170194423220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336822435980
+  version_requirements: *70170194423220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70336822459820 !ruby/object:Gem::Requirement
+  requirement: &70170194421440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,12 +65,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336822459820
+  version_requirements: *70170194421440
 description: The "Lazy" Twitter API Library for Ruby 1.9.x. Easy to use.
 email:
 - oame@oameya.com
 executables:
-- hitomi
+- eyedrops
 extensions: []
 extra_rdoc_files: []
 files:
@@ -82,7 +82,7 @@ files:
 - README.ja.md
 - README.md
 - Rakefile
-- bin/hitomi
+- bin/eyedrops
 - lib/pupil.rb
 - lib/pupil/account.rb
 - lib/pupil/base.rb