gogdb 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82cfcbddbebad876b49fd5dd07b98524daefdce5
-  data.tar.gz: 1e1c39defc8346d307931e31dd453bff05011171
+  metadata.gz: db7cfdc7fc7c0b4badbf49971fc198d5b53790ec
+  data.tar.gz: 835af1c3fd059c28e0a198d367d429febacc29ac
 SHA512:
-  metadata.gz: aad7dc8e62fe1867dfeda1d8505c0dc5156e88defa212916e2ff664bc2dc2461af0ad00a01793e6c5d0a67af04bbc98b0ac907a78ce3407a7d9cd2b71d13f57a
-  data.tar.gz: c3d4d03217dd48daee67bcd48eb52f435c8adcaccfe2c44a3b9910006be50300f24c0b7c83661af8d22a57a48bb064fadd6595a4299ac6d6a0a949664ba6934d
+  metadata.gz: 41e49bd2545e506a683298d0f99df8a39ed9f6d0ca3ccc8f5b79ad15e1d09f751fd8cbba7ee93a9cfd51d937905fc0ed40464ace97ce33c85cbc8d8728996678
+  data.tar.gz: c237f2b58cf828d181e89e138edfdfdb8bfb3d4f2745f1623001e310cc8acca456af8b7f9db7ac10872a8ea151af3a3024c1d9f6fb8ed97edea0e39947b604a6

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+## 0.0.21 (currently in development)
+
+nil
+
+## 0.0.2
+
+Features:
+  
+  * Setup command, which creates config file
+  * Implemented config check before every command
+  * Added `gogdb version` alias `gogdb --version`
+  * Added request limit option to `gogdb fetch`
+  * Added default database path to config
+  * Fixed `--type` parameter (you could fetch only games or movies, but not both)
+
+## 0.0.1
+
+Initial release;

data/lib/gogdb.rb

@@ -3,6 +3,8 @@ require 'colorize'
 require 'net/http'
 require 'net/ping'
 require 'json'
+require 'yaml'
+
 require 'gogdb/version'
 require 'gogdb/engine'
 require 'gogdb/utils'

data/lib/gogdb/cli.rb

@@ -1,27 +1,61 @@
 module Gogdb
   
   class Cli < Thor
+    def initialize(*args)
+      check_config
+      super
+    end
+
     package_name "Gogdb"
-    map "-L" => :list
+    map "--version" => :version
 
     desc "version", "Shows current version"
     def version
       puts Gogdb::VERSION
     end
 
-    desc "sync [options]", "Syncs all data between databases"
-    def sync
-    end
-
-    desc "fetch [options]", "Fetches items from gog.com and updates database"
-    method_option :limit, :type => :numeric, :desc => "How many items to fetch [0 - no limit]", :default => 0
-    method_option :type, :type => :string, :enum => ["all", "games", "movies"], :desc => "Type items to fetch", :default => "all"
-    method_option :debug, :type => :boolean, :desc => "Show debug messages", :default => false
-    method_option :silent, :type => :boolean, :desc => "Hide all output", :default => false
+    desc "fetch [options]", "Fetches data and updates database"
+    method_option :limit, :type => :numeric, :desc => "How many items you want to fetch. 0 means no limit.", :default => 0
+    method_option :requestLimit, :type => :numeric, :desc => "Limit requests per minute. 0 means no limit.", :default => 12
+    method_option :type, :type => :string, :enum => ["all", "games", "movies"], :desc => "What type of items you want to fetch.", :default => "all"
+    method_option :debug, :type => :boolean, :desc => "Enables debug messages. Useful if you want to see what's happening step-by-step.", :default => false
+    method_option :silent, :type => :boolean, :desc => "Hides all output. Even debug messages.", :default => false
     def fetch
       @e = Gogdb::Engine.new(options)
       @e.fetch(options)
     end
 
+    desc "setup", "Run automatic configuration."
+    def setup
+      db_path = ask("Enter path you want to save database (default #{ENV['HOME']}/.gogdb):")
+
+      db_path = "#{ENV['HOME']}/.gogdb" if db_path.empty?
+
+      @config = {
+        "path" => db_path
+      }
+
+      # Stop execution if user does not want to overwrite.
+      if File.exist?("config.yml")
+        exit unless yes? "Config file already exists. Overwrite?(y/n)", :red
+      end
+      
+      File.open("config.yml", "w") { |file|
+        file.write(@config.to_yaml)
+      }
+
+      say "Config written successfully.", :green
+    end
+
+    private
+
+    # Checks if config file exists. If not, runs setup automatically.
+    def check_config
+      unless File.exist?("config.yml")
+        say "It appears that you don't have config in place. You need to enter following details to make Gogdb work;", :yellow
+        setup
+      end
+    end
+
   end
 end

data/lib/gogdb/engine.rb

@@ -10,31 +10,41 @@ module Gogdb
     #
     # @param [Hash] options Additional options such as :limit and :type
     def fetch(options)
-      url = GOG_GAMES_URL if options[:type] == "games"
-      url = GOG_MOVIES_URL if options[:type] == "movies"
+      # If user passed type parameter, we need to figure it out which urls we
+      # need actually to fetch 
+      sources = []
+      sources.push(GOG_GAMES_URL) if options[:type] == "games"
+      sources.push(GOG_MOVIES_URL) if options[:type] == "movies"
+      sources = [GOG_GAMES_URL, GOG_MOVIES_URL] if options[:type] == "all" || options[:type] == nil
 
-      pages_number = get_pages_number(url)
-      @logger.debug "Pages received: #{pages_number}"
-      nil if pages_number < 1 # Do nothing if there are no pages
+      sleep_time = 60 / options[:requestLimit]
 
-      # Loop through pages
-      count = 0;
-      catch :limitReached do
-        for i in 0..pages_number do
-          # Let's get products number and URL's for current page
-          items_data = get_data(url)['products']
-          items_number = items_data.length
-          
-          # Loop through products and get data of every one
-          for i in 0..items_number do
-            item_url = items_data[i]['url']
-            item_data = get_data("#{GOG_URL}#{item_url}")['gameProductData']
+      sources.each do |source|
+        pages_number = get_pages_number(source)
+        @logger.debug "Pages received: #{pages_number}"
+        nil if pages_number < 1 # Do nothing if there are no pages
+
+        # Loop through pages
+        count = 0;
+        catch :limitReached do
+          for i in 0..pages_number do
+            # Let's get products number and URL's for current page
+            items_data = get_data(source)['products']
+            items_number = items_data.length
+            
+            # Loop through products and get data of every one
+            for i in 0..items_number do
+              item_url = items_data[i]['url']
+              item_data = get_data("#{GOG_URL}#{item_url}")['gameProductData']
 
-            @logger.debug "Item received: #{item_data['title']}"
+              @logger.debug "Item received: #{item_data['title']}"
 
-            count += 1
-            # Break loop if limit is reached
-            throw :limitReached if count >= options[:limit] && options[:limit] != 0
+              count += 1
+              # Break loop if limit is reached
+              throw :limitReached if count >= options[:limit] && options[:limit] != 0
+              
+              sleep(sleep_time)
+            end
           end
         end
       end

data/lib/gogdb/version.rb

@@ -1,3 +1,3 @@
 module Gogdb
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogdb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Rolandas Barysas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,6 +130,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
 - bin/gogdb