factorio-mod 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23bed56060aa457dbaff5e7bfb4594b03f350eac08f7f54c887955c34380e989
-  data.tar.gz: ede2f5f998f5f73890159218757e2bdf0d7e95f8aed8814aaa9a482db876eec9
+  metadata.gz: eab89026d714d5fe2035918a550368313b0d4f03214e0df9bfa87c9689891b51
+  data.tar.gz: 8bdf056b0f5b5435ac4d4207c06172e835d4c1767c9464af988dfaec2a6c90bf
 SHA512:
-  metadata.gz: 19e00bbb03c8c85a8020523907e83a01189fe31a7625a298bab0944c16ba2867a99019570531d778463a065cdf8ff9df0fdcdd98897a48a5bc92bfb31a349e40
-  data.tar.gz: 27d0e6d2a5d5a56b624cafc74fdae2de555a6c2c061fdc9eb8fc6fbdedcb880ab627dc144b007f451bd375ac78b9fc4e126024867231fa565246aba1aaac7057
+  metadata.gz: 19ba0055879c601bda30be33d49064ee947e84d37da76a75ee480fb285f85f61b5da82b0d1ad2d755633c1e263902af6bba735de443a6ec1e62de9f8a6525936
+  data.tar.gz: e8fd3a9596712a8d580eeb38046d995bd66db2a400f9b80bd4356e33a2f8182cc6a01a562c969d1fc6033ff6532506a298d5229670497157ab955937525a8712

data/.coco.yml

@@ -1,7 +1,7 @@
 :exclude:
-  - lib/Factorio/mod.rb
-  - lib/Factorio/mod/version.rb
-  - lib/Factorio/mod/exception.rb
+  - lib/factorio/mod.rb
+  - lib/factorio/mod/version.rb
+  - lib/factorio/mod/exception.rb
   - spec
 :single_line_report: false
 :exclude_above_threshold: false

data/.gitlab-ci.yml

@@ -0,0 +1,16 @@
+variables:
+  FORCE_LOGIN_ENV: 'true'
+
+before_script:
+  - ruby -v
+  - which ruby
+  - gem install bundler --no-ri --no-rdoc
+  - bundle install --jobs $(nproc)  "${FLAGS[@]}"
+
+rspec:
+  script:
+    - bundle exec rspec
+
+rubocop:
+  script:
+    - bundle exec rubocop

data/Gemfile.lock

@@ -1,32 +1,49 @@
 PATH
   remote: .
   specs:
-    factorio-mod (0.2.1)
+    factorio-mod (0.2.2)
       nokogiri (~> 1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.0)
     bump (0.6.1)
     coco (0.15.0)
     diff-lcs (1.3)
+    jaro_winkler (1.5.1)
     mini_portile2 (2.3.0)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
+    parallel (1.12.1)
+    parser (2.5.1.2)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    rainbow (3.0.0)
     rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.58.2)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.10.0)
+    unicode-display_width (1.4.0)
 
 PLATFORMS
   ruby
@@ -38,6 +55,7 @@ DEPENDENCIES
   factorio-mod!
   rake (~> 10.0)
   rspec (~> 3.0)
+  rubocop
 
 BUNDLED WITH
-   1.16.3
+   1.16.4

data/README.md

@@ -1,5 +1,8 @@
 # Factorio::Mod
 
+[![pipeline status](https://gitlab.com/71e6fd52/factorio-mod/badges/master/pipeline.svg)](https://gitlab.com/71e6fd52/factorio-mod/commits/master)
+[![coverage report](https://gitlab.com/71e6fd52/factorio-mod/badges/master/coverage.svg)](https://gitlab.com/71e6fd52/factorio-mod/commits/master)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/factorio-mod.gemspec

@@ -1,4 +1,3 @@
-
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'factorio/mod/version'
@@ -28,6 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bump'
   spec.add_development_dependency 'coco'
+  spec.add_development_dependency 'rubocop'
 
   spec.add_dependency 'nokogiri', '~> 1.8'
 end

data/lib/factorio/mod.rb

@@ -2,7 +2,7 @@ require 'factorio/mod/version'
 
 require 'factorio/mod/mod'
 require 'factorio/mod/exception'
-require 'factorio/mod/get_on_read.rb'
+require 'factorio/mod/cache'
 
 require 'open-uri'
 require 'net/http'

data/lib/factorio/mod/{get_on_read.rb → cache.rb}

@@ -1,6 +1,6 @@
 module Factorio
-  # get on read
-  class GoR
+  # cache mod info
+  class Cache
     attr_reader :gotten
 
     def initialize(uri, cookie = '')
@@ -34,7 +34,7 @@ module Factorio
       symbol = symbol.to_sym
       return instance_variable_get "@#{symbol}" if @gotten[symbol]
       instance_variable_set "@#{symbol}", Nokogiri::HTML(
-        open(uri, 'Cookie' => @cookie)
+        URI.open(uri, 'Cookie' => @cookie)
       )
       @gotten[symbol] = true
       instance_variable_get "@#{symbol}"

data/lib/factorio/mod/mod.rb

@@ -20,7 +20,16 @@ module Factorio
     # @param cookie [String] logged in cookie
     def initialize(name, cookie = '')
       @name = name
-      @mod = GoR.new "#{MOD_URI}/mod/#{ERB::Util.url_encode @name}", cookie
+      @mod = Cache.new "#{MOD_URI}/mod/#{ERB::Util.url_encode @name}", cookie
+    end
+
+    private
+
+    def data_table(key = '')
+      table = @mod.mod.xpath("//div[@class='mod-page-data-table']")
+      return table if key == ''
+      xpath = "//td[../td[@class='data-name'][.='#{key}:']]"
+      table.xpath xpath
     end
 
     # @return [String, String] csrf_token and cookie
@@ -32,6 +41,24 @@ module Factorio
     end
     private_class_method :csrf_and_cookie
 
+    public
+
+    # rubocop:disable MethodLength
+    def self.bind_td_to_th(table_head, line)
+      line.css('td').each_with_index.each_with_object({}) \
+        do |(item, index), obj|
+        key = table_head[index]
+        if key == 'Download'
+          href = item.xpath('a/@href').to_s
+          raise NotLoginError if href =~ %r{^/login}
+          obj[:uri] = MOD_URI + href
+        else
+          obj[TABLE_HEAD_TO_GOOD_NAME[key]] = item.text
+        end
+      end
+    end
+    # rubocop:enable MethodLength
+
     # Get logged in cookie
     # @param username [String]
     # @param password [String]
@@ -60,14 +87,6 @@ module Factorio
       @mod.any.css('.mod-card-summary').text
     end
 
-    def data_table(key = '')
-      table = @mod.mod.xpath("//div[@class='mod-page-data-table']")
-      return table if key == ''
-      xpath = "//td[../td[@class='data-name'][.='#{key}:']]"
-      table.xpath xpath
-    end
-    private :data_table
-
     # Get github uri
     # @return [String] github uri
     def github
@@ -128,23 +147,5 @@ module Factorio
         Mod.bind_td_to_th head, line
       end
     end
-
-    private_class_method
-
-    # rubocop:disable MethodLength
-    def self.bind_td_to_th(table_head, line)
-      line.css('td').each_with_index.each_with_object({}) \
-        do |(item, index), obj|
-        key = table_head[index]
-        if key == 'Download'
-          href = item.xpath('a/@href').to_s
-          raise NotLoginError if href =~ %r{^/login}
-          obj[:uri] = MOD_URI + href
-        else
-          obj[TABLE_HEAD_TO_GOOD_NAME[key]] = item.text
-        end
-      end
-    end
-    # rubocop:enable MethodLength
   end
 end

data/lib/factorio/mod/version.rb

@@ -1,5 +1,5 @@
 module Factorio
   class Mod
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.2.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factorio-mod
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - 71e6fd52
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -103,8 +117,8 @@ extra_rdoc_files: []
 files:
 - ".coco.yml"
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -114,8 +128,8 @@ files:
 - bin/setup
 - factorio-mod.gemspec
 - lib/factorio/mod.rb
+- lib/factorio/mod/cache.rb
 - lib/factorio/mod/exception.rb
-- lib/factorio/mod/get_on_read.rb
 - lib/factorio/mod/mod.rb
 - lib/factorio/mod/version.rb
 homepage: https://gitlab.com/71e6fd52/factorio-mod

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.0
-before_install: gem install bundler -v 1.16.1