commons_upload 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2628e2d11f98afd0f6f852271c70822dd7e3a13b
-  data.tar.gz: 7bdea102ebb5e865f1140a4a5e0e88be3998dbc5
+SHA256:
+  metadata.gz: eebc8ad7139529eb45960653266cc6a0656db1ef7f7f1b119bfd283151a40b38
+  data.tar.gz: a1fb75e17150721c83168e3591c70cda453b8e5ff3b378ff73da3fbb6a009088
 SHA512:
-  metadata.gz: b6d526cd37d69badca5accdf2f1a30bdfa1cd98ceead2930b62e55376dec97e48460c7521c53feb8fa44ce46ee621f2ae1392ed266f5e5c9a8b7e61ee5f6f586
-  data.tar.gz: 0e8dbbe13699a592773619568209b1d635c2185b161602ce9d338180d2a40a0bdf138e8f9cc4bec710012f0cff7e831b81334b99394332e9023532c77f239d39
+  metadata.gz: 011aae0dcf05a234f4534ae5352d6fb153a3cdff04c0ab7734aad052a7cc8db15ac3e0899e01254603cf951b589764df8d0fabffb447da5b5570b9275c6f40b7
+  data.tar.gz: 5f9181a46864f1660a080212b97bbb4ca762b74217f7cfe05d703e1dd79d2cde6b0e8e5b09ad519e6c39a50c68a221d75569645ea08ac9c0ccd9b1bf25352890

data/.rubocop.yml

@@ -1,8 +1,6 @@
-inherit_from: .rubocop_todo.yml
-
 # Needed for ignoring leading whitespace in heredoc
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.3
 
 # The default is 15, which is too tight
 Metrics/AbcSize:

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.5
+  - 2.3
 install: bundle install
 script:
   - bundle exec rubocop

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in commons_upload.gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2016 Vikas Yaligar, Željko Filipin and Amir E. Aharoni
+Copyright (c) 2014-2018 Vikas Yaligar, Željko Filipin and Amir E. Aharoni
 under the terms of The MIT License (MIT), as follows:
 
 This software consists of voluntary contributions made by many

data/README.md

@@ -25,6 +25,8 @@ Or install it yourself as:
 To run the upload, do
 
     # optional, the default is ./screenshots
+    # file names have to be in this format VisualEditor_category_item-en.png
+    # language code is `en`, between `-` and `.`
     export LANGUAGE_SCREENSHOT_PATH=./screenshots
 
     # testing:    https://commons.wikimedia.beta.wmflabs.org/w/api.php
@@ -43,3 +45,5 @@ To run the upload, do
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+[![Build Status](https://travis-ci.org/amire80/commons_upload.svg?branch=master)](https://travis-ci.org/amire80/commons_upload)

data/Rakefile

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'

data/bin/upload

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'commons_upload'
 
 CommonsUpload.images

data/commons_upload.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'commons_upload/version'
 
@@ -14,15 +15,15 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/amire80/commons_upload'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '~> 2.3'
 
-  spec.add_runtime_dependency 'mediawiki_api', '~> 0.7.0'
+  spec.add_runtime_dependency 'mediawiki_api', '~> 0.7.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake', '~> 10.1'
-  spec.add_development_dependency 'rubocop', '~> 0.42.0'
+  spec.add_development_dependency 'bundler', '~> 1.16', '>= 1.16.1'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rubocop', '~> 0.53.0'
 end

data/lib/commons_upload.rb

@@ -1,4 +1,12 @@
+# frozen_string_literal: true
+
+# Iterate over all images, create license, upload image by image
 module CommonsUpload
+  def self.edit(file_name, client)
+    page = "File:#{file_name}"
+    client.edit(title: page, text: license(file_name), summary: 'Update page text')
+  end
+
   def self.license(file_name)
     require 'date'
     date = Date.today.to_s
@@ -8,31 +16,41 @@ module CommonsUpload
     # in this case it is: en
     language_code = file_name.split('-')[1].split('.')[0]
 
-    <<EOS
-=={{int:filedesc}}==
-{{Information
-|description={{en|1=#{file_name}}}
-|date=#{date}
-|source=[[User:LanguageScreenshotBot|Automatically created by LanguageScreenshotBot]]
-|author=[[User:LanguageScreenshotBot|Automatically created by LanguageScreenshotBot]]
-|permission=
-|other_versions=
-|other_fields=
-}}
-
-=={{int:license-header}}==
-{{Wikipedia-screenshot}}
-
-[[Category:VisualEditor-#{language_code}]]
-EOS
+    <<~LICENSE
+      =={{int:filedesc}}==
+      {{Information
+      |description={{en|1=#{file_name}}}
+      |date=#{date}
+      |source=[[User:LanguageScreenshotBot|Automatically created by LanguageScreenshotBot]]
+      |author=[[User:LanguageScreenshotBot|Automatically created by LanguageScreenshotBot]]
+      |permission=
+      |other_versions=
+      |other_fields=
+      }}
+
+      =={{int:license-header}}==
+      {{Wikimedia-screenshot}}
+
+      [[Category:VisualEditor-#{language_code}]]
+    LICENSE
   end
 
   def self.image(file_path, client)
     file_name = File.basename(file_path, '')
     file_license = license(file_name)
 
-    client.upload_image(file_name, file_path, file_license, true)
-    sleep 5 # Restriction in bot speed: https://commons.wikimedia.org/wiki/Commons:Bots#Bot_speed
+    begin
+      client.upload_image(
+        file_name, file_path, 'Upload new version of the file', true, file_license
+      )
+      return 'OK'
+    rescue MediawikiApi::ApiError => mwerr
+      raise mwerr if mwerr.code != 'fileexists-no-change'
+      return 'OK (file already uploaded)'
+    ensure
+      edit(file_name, client) # update page content
+      sleep 5 # Restriction in bot speed: https://commons.wikimedia.org/wiki/Commons:Bots#Bot_speed
+    end
   end
 
   def self.images
@@ -41,8 +59,16 @@ EOS
     client = MediawikiApi::Client.new ENV['MEDIAWIKI_API_UPLOAD_URL']
     client.log_in ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD']
     Dir["#{screenshot_directory}/*.png"].each do |file_path|
-      puts "Uploading #{file_path}"
-      image file_path, client
+      print "Uploading #{file_path} ... "
+      STDOUT.flush
+      begin
+        message = image file_path, client
+        puts message
+      rescue StandardError => e
+        puts 'FAILED'
+        raise e
+      end
+      STDOUT.flush
     end
   end
 end

data/lib/commons_upload/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CommonsUpload
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commons_upload
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Vikas Yaligar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mediawiki_api
@@ -18,56 +18,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.53.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.53.0
 description: Upload images to Wikimedia Commons. This is intended for uploading auto-translated
   screenshots for MediaWiki documentation.
 email:
@@ -79,7 +85,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -101,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -109,9 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Upload images to Wikimedia Commons.
 test_files: []
-has_rdoc: 

data/.rubocop_todo.yml

@@ -1,35 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2016-08-22 17:24:35 +0200 using RuboCop version 0.42.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-    - 'lib/commons_upload.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: when_needed, always
-Style/FrozenStringLiteralComment:
-  Exclude:
-    - 'Gemfile'
-    - 'Rakefile'
-    - 'bin/upload'
-    - 'commons_upload.gemspec'
-    - 'lib/commons_upload.rb'
-    - 'lib/commons_upload/version.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: use_perl_names, use_english_names
-Style/SpecialGlobalVars:
-  Exclude:
-    - 'commons_upload.gemspec'