scrapescrobbler 0.1.1 → 0.1.2

data/lib/scrapescrobbler/commands/authenticate.rb

@@ -2,9 +2,14 @@ module Scrapescrobbler
   module CLI
     def authenticate
       lastfm = Lastfm.new Config['api_key'], Config['api_secret']
-      token = lastfm.auth.get_token
-      say "Go to http://www.last.fm/api/auth/?api_key=#{Config['api_key']}&token=#{token} to allow scrapescrobbler to access your last.fm account."
-      Config.update! 'token' => token
+      if not Config['token']
+        token = lastfm.auth.get_token
+        say "Go to http://www.last.fm/api/auth/?api_key=#{Config['api_key']}&token=#{token} to allow scrapescrobbler to access your last.fm account."
+        Config.update! 'token' => token, 'session' => nil
+        exit
+      elsif not Config['session']
+        Config.update! 'session' => lastfm.auth.get_session(Config['token'])
+      end
     end
   end
 end

data/lib/scrapescrobbler/listener.rb

@@ -39,14 +39,13 @@ module Scrapescrobbler
     private
 
     def self.authenticate
-      if not Config['token']
+      if not Config['session']
         CLI.authenticate
-        exit
-      else
-        lastfm = Lastfm.new Config['api_key'], Config['api_secret']
-        lastfm.session = lastfm.auth.get_session(Config['token'])
-        lastfm
       end
+
+      lastfm = Lastfm.new Config['api_key'], Config['api_secret']
+      lastfm.session = Config['session']
+      lastfm
     end
   end
 end

data/lib/scrapescrobbler/version.rb

@@ -1,3 +1,3 @@
 module Scrapescrobbler
-  VERSION = "0.1.1" unless defined?(::Scrapescrobbler::VERSION)
+  VERSION = "0.1.2" unless defined?(::Scrapescrobbler::VERSION)
 end

data/scrapescrobbler.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency "dm-migrations"
   s.add_dependency "dm-validations"
   s.add_dependency "activesupport", ">= 3.0.0"
+  s.add_dependency "i18n"
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- spec/*`.split("\n")

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: scrapescrobbler
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors: 
 - Christopher Peplin
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 -05:00
+date: 2011-05-01 00:00:00 -04:00
 default_executable: scrapescrobble
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -38,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -51,8 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -64,10 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
         version: 0.2.0
   type: :runtime
   version_requirements: *id004
@@ -79,8 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
@@ -92,8 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id006
@@ -105,8 +87,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id007
@@ -118,8 +98,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id008
@@ -131,13 +109,20 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id010
 description: Scrapescobbler is a tool to submit tracks you're listening to on an old-fashioned radio station to last.fm.
 email: chris.peplin@rhubarbtech.com
 executables: 
@@ -188,23 +173,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Radio station last.fm scrobbler