vkpd 1.1.0 → 1.1.1

data/lib/vkpd/cli.rb

@@ -1,14 +1,5 @@
 module Vkpd
   class CLI
-    # Reads config file, parses it as yaml and caches the result
-    def config
-      unless File.exist? Vkpd::config_path
-        puts 'Please authenticate. Start vkpd-auth.rb and point your browser to http://localhost.localdomain:4567/'
-        exit 1
-      end
-      @config ||= YAML.load File.read(Vkpd::config_path)
-    end
-  
     # main CLI method
     def main
       mpd = MPD.new 'localhost'
@@ -46,7 +37,7 @@ module Vkpd
           if !ARGV.empty? and ARGV.first.match(/^\d+$/)
             params['uid'] = ARGV.shift
           else
-            params['uid'] = config["user_id"]
+            params['uid'] = Vkpd::config["user_id"]
           end
         when 'group'
           method = 'audio.get'
@@ -67,7 +58,7 @@ module Vkpd
       end
   
   
-      params["access_token"]=config["access_token"]
+      params["access_token"]=Vkpd::config["access_token"]
       
       connection=Net::HTTP.new("api.vk.com",443)
       connection.use_ssl=true

data/lib/vkpd/version.rb

@@ -1,3 +1,3 @@
 module Vkpd
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/vkpd.rb

@@ -14,17 +14,19 @@ require 'vkpd/auth'
 module Vkpd
   APP_ID='2803517'
   
-  def self.config_path
-    @config_path ||= "#{ENV['HOME']}/.config/vkpd.yaml"
-  end
+  class <<self
+    def config_path
+      @config_path ||= "#{ENV['HOME']}/.config/vkpd.yaml"
+    end
 
-  # Reads config file, parses it as yaml and caches the result
-  def config
-    unless File.exist? config_path
-      puts 'Please authenticate. Type `vkpd auth` and point your browser to http://localhost.localdomain:4567/'
-      exit 1
+    # Reads config file, parses it as yaml and caches the result
+    def config
+      unless File.exist? config_path
+        puts 'Please authenticate. Type `vkpd auth` and point your browser to http://localhost.localdomain:4567/'
+        exit 1
+      end
+      @config ||= YAML.load File.read(config_path)
     end
-    @config ||= YAML.load File.read(config_path)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vkpd
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra