oauth-cli-twitter 0.0.2 → 0.0.4

data/README.md

@@ -76,10 +76,10 @@ Usage
 Requirement
 -----------
 
- * oauth
  * readline
+ * oauth
  * termtter
- * pit
+ * [pit](http://rubygems.org/gems/pit)
 
 Install
 -------

data/Rakefile

@@ -21,17 +21,14 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
-  spec.rcov_opts = ["--gcc"]
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

data/lib/oauth/cli/twitter.rb

@@ -1,7 +1,7 @@
 
+require 'readline'
 require 'rubygems'
 require 'oauth'
-require 'readline'
 require 'termtter/system_extensions'
 require 'pit'
 
@@ -16,14 +16,23 @@ module OAuth
       def self.included(includer)
         @includer = includer
       end
-      attr_accessor :includer
+
+      def self.extended(extender)
+        @extender = extender
+      end
+
+      attr_accessor :includer, :extender
     
       def get_access_token(*args)
         case args.size
         when 1
           @options = args[0]
-          # TODO: add extender ?
-          if Twitter.includer &&
+          if Twitter.extender &&
+             Twitter.extender.const_defined?(:CONSUMER_TOKEN) &&
+             Twitter.extender.const_defined?(:CONSUMER_SECRET)
+            @consumer_token  = Twitter.extender::CONSUMER_TOKEN
+            @consumer_secret = Twitter.extender::CONSUMER_SECRET
+          elsif Twitter.includer &&
              Twitter.includer.const_defined?(:CONSUMER_TOKEN) &&
              Twitter.includer.const_defined?(:CONSUMER_SECRET)
             @consumer_token  = Twitter.includer::CONSUMER_TOKEN
@@ -55,7 +64,7 @@ module OAuth
           @access_token.params = config
         else
           @access_token = authorize
-          save_config(config)
+          save_config(@access_token)
         end
         @access_token
       end
@@ -68,9 +77,11 @@ module OAuth
         end
       end
     
-      def save_config(config)
-        config = {} if !config
-        config.update(@access_token.params)
+      def save_config(access_token)
+        config = {}
+        access_token.params.each do |k, v|
+          config[k] = v if k.is_a?(String)
+        end
         if @options[:pit]
           Pit.set(@options[:pit], :data => config)
         elsif @options[:file]

data/oauth-cli-twitter.gemspec

@@ -5,30 +5,24 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth-cli-twitter}
-  s.version = "0.0.2"
+  s.version = "0.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["tily"]
-  s.date = %q{2010-10-31}
+  s.date = %q{2010-10-29}
   s.description = %q{Twitter OAuth Interface for CLI Applications}
   s.email = %q{tily05@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+     "README.rdoc"
   ]
   s.files = [
     ".document",
      ".gitignore",
      "LICENSE",
-     "README.md",
+     "README.rdoc",
      "Rakefile",
      "VERSION",
-     "example/define_constant.rb",
-     "example/inclusion.rb",
-     "example/simple.rb",
-     "lib/oauth/cli/twitter.rb",
-     "oauth-cli-twitter.gemspec",
-     "spec/oauth_cli_twitter_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
@@ -48,20 +42,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<oauth>, [">= 0"])
-      s.add_runtime_dependency(%q<termtter>, [">= 0"])
-      s.add_runtime_dependency(%q<pit>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<oauth>, [">= 0"])
-      s.add_dependency(%q<termtter>, [">= 0"])
-      s.add_dependency(%q<pit>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<oauth>, [">= 0"])
-    s.add_dependency(%q<termtter>, [">= 0"])
-    s.add_dependency(%q<pit>, [">= 0"])
   end
 end
 

data/spec/oauth_cli_twitter_spec.rb

@@ -2,7 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe OAuth::CLI::Twitter do
   before do
-    @twitter = Object.new.extend(OAuth::CLI::Twitter)
+    @klass = Class.new
+    @klass.send(:include, OAuth::CLI::Twitter)
+    @twitter = @klass.new
   end
 
   describe 'taking arguments' do
@@ -49,11 +51,11 @@ describe OAuth::CLI::Twitter do
 
     it '#get_access_token gets constants of Object' do
       @twitter.should_receive(:execute).and_return(@access_token)
-      Object::CONSUMER_TOKEN = 'object consumer token'
-      Object::CONSUMER_SECRET = 'object consumer secret'
+      @klass::CONSUMER_TOKEN = 'object consumer token'
+      @klass::CONSUMER_SECRET = 'object consumer secret'
       @twitter.get_access_token(@options)
-      @twitter.instance_variable_get('@consumer_token').should == Object::CONSUMER_TOKEN
-      @twitter.instance_variable_get('@consumer_secret').should == Object::CONSUMER_SECRET
+      @twitter.instance_variable_get('@consumer_token').should == @klass::CONSUMER_TOKEN
+      @twitter.instance_variable_get('@consumer_secret').should == @klass::CONSUMER_SECRET
     end
 
     it '#get_access_token gets constants of includer' do
@@ -66,6 +68,17 @@ describe OAuth::CLI::Twitter do
       @twitter.instance_variable_get('@consumer_token').should == @klass::CONSUMER_TOKEN
       @twitter.instance_variable_get('@consumer_secret').should == @klass::CONSUMER_SECRET
     end
+
+    it '#get_access_token gets constants of extender' do
+      @twitter.should_receive(:execute).and_return(@access_token)
+      @obj = Class.new
+      @obj::CONSUMER_TOKEN = 'extender consumer token'
+      @obj::CONSUMER_SECRET = 'extender consumer secret'
+      @obj.send(:extend, OAuth::CLI::Twitter)
+      @twitter.get_access_token(@options)
+      @twitter.instance_variable_get('@consumer_token').should == @obj::CONSUMER_TOKEN
+      @twitter.instance_variable_get('@consumer_secret').should == @obj::CONSUMER_SECRET
+    end
   end
 
   describe 'execution' do
@@ -76,6 +89,7 @@ describe OAuth::CLI::Twitter do
     it '#execute and config loaded' do
       config = {'oauth_token' => 'dummy oauth token', 'oauth_token_secret' => 'dummy oauth token secret'}
       consumer = 'dummy consumer'
+      @access_token.should_receive(:params=).with(config)
       @twitter.should_receive(:load_config).and_return(config)
       @twitter.should_receive(:consumer).and_return(consumer)
       OAuth::AccessToken.should_receive(:new).with(consumer, config['oauth_token'], config['oauth_token_secret']).and_return(@access_token)
@@ -86,7 +100,7 @@ describe OAuth::CLI::Twitter do
       config = {}
       @twitter.should_receive(:load_config).and_return(config)
       @twitter.should_receive(:authorize).and_return(@access_token)
-      @twitter.should_receive(:save_config).with(config)
+      @twitter.should_receive(:save_config).with(@access_token)
       @twitter.execute.should == @access_token
     end
   end
@@ -109,6 +123,7 @@ describe OAuth::CLI::Twitter do
       file = '/path/to/.conf'
       yaml = '- dummy yaml'
 
+      File.should_receive(:exist?).with(file).and_return(true)
       File.should_receive(:read).with(file).and_return(yaml)
       YAML.should_receive(:load).with(yaml).and_return(@config)
 
@@ -119,34 +134,33 @@ describe OAuth::CLI::Twitter do
 
   describe 'saving config' do
     before do
-      @twitter.instance_variable_set('@access_token', mock.tap {|m|
-        m.should_receive(:params).and_return('dummy access token params')
-      })
-      @config = mock.tap {|m| m.should_receive(:update).with('dummy access token params') }
+      @config = {'string_key' => 'value', :symbol_key => :value}
+      @access_token = mock.tap {|m| m.should_receive(:params).and_return(@config) }
+      @twitter.instance_variable_set('@access_token', @access_token)
     end
 
     it '#save_config to pit' do
       pit = 'pit key'
+      data = {'string_key' => 'value'}
 
-      Pit.should_receive(:set).with(pit, :data => @config)
+      Pit.should_receive(:set).with(pit, :data => data) 
 
       @twitter.instance_variable_set('@options', {:pit => pit})
     end
 
     it '#save_config to file' do
       file = '/path/to/.conf'
-      yaml = '- dummy yaml'
+      yaml = "--- \nstring_key: value\n"
 
       File.should_receive(:open).with(file, 'w').and_yield(
         mock.tap {|m| m.should_receive(:write).with(yaml) }
       )
-      @config.should_receive(:to_yaml).and_return(yaml)
 
       @twitter.instance_variable_set('@options', {:file => file})
     end
 
     after do
-      @twitter.save_config(@config)
+      @twitter.save_config(@access_token)
     end
   end
 

data/spec/spec_helper.rb

@@ -1,9 +1,5 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'oauth/cli/twitter'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  
-end
+require 'rspec'
+require 'rspec/autorun'

metadata

@@ -1,93 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oauth-cli-twitter
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - tily
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-31 00:00:00 +09:00
+date: 2011-10-06 00:00:00.000000000 +09:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &209398320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.9
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: oauth
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *209398320
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: &209397700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: termtter
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *209397700
+- !ruby/object:Gem::Dependency
+  name: termtter
+  requirement: &209396800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: pit
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *209396800
+- !ruby/object:Gem::Dependency
+  name: pit
+  requirement: &209396000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *209396000
 description: Twitter OAuth Interface for CLI Applications
 email: tily05@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .document
-- .gitignore
 - LICENSE
 - README.md
 - Rakefile
@@ -103,37 +80,26 @@ files:
 has_rdoc: true
 homepage: http://github.com/tily/ruby-oauth-cli-twitter
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Twitter OAuth Interface for CLI Applications
-test_files: 
-- spec/oauth_cli_twitter_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC