elexis-wiki-interface 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ce49a15cb845a0cdfc0877279106c0c3f07ac9a
-  data.tar.gz: f18d578327aa1ddf483de7036b12747fd37067fd
+  metadata.gz: 291384c9cc7a771163d3852d2e385f453a07ef04
+  data.tar.gz: fb1ae9a6f28c11accef947fed4a0589cec24aa57
 SHA512:
-  metadata.gz: b97ac0b5d7affd17837da3ed44058c56b1bcc459b6fbb6351b3ea0509af483bdc722c45588bcb0edab24d0ac8995cd9b030b1c0d3c6f01cdb7467144c92d1261
-  data.tar.gz: bbea945c3ac300dd6adfa5e0f798486b3da44ed90b902ba65fc28c09ef9a6d39cde5f99825aff686cb815c5dc77606a7976cea55c8972d9495cf2b572378a418
+  metadata.gz: 4e2d1634af029853509980f403d3192ddb8bccedfaa6952dacf22318692b338826d14912b5f72474bc05236126e38c4beaa24d55d91dda12ee499d099bf1cf28
+  data.tar.gz: 1e0449c892a184e296ebb54ef91cfac61fb48136f35d31a1be985200a3206eb8100aadd9a19ba4a520cdb563555b2f343c5ddbddf288d12b3bb580f1a8f47c60

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elexis-wiki-interface (0.5.0)
+    elexis-wiki-interface (0.5.1)
       eclipse-plugin (>= 0.1)
       mediawiki-gateway
       mediawiki_api
@@ -17,12 +17,12 @@ GEM
     columnize (0.9.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
     eclipse-plugin (0.3)
       nokogiri
       rubyzip (< 1.0.0)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
@@ -36,7 +36,7 @@ GEM
       faraday (~> 0.9, >= 0.9.0)
       faraday-cookie_jar (~> 0.0, >= 0.0.6)
     method_source (0.8.2)
-    mime-types (2.6.1)
+    mime-types (2.6.2)
     mini_portile (0.6.2)
     multipart-post (2.0.0)
     netrc (0.10.3)

data/README.textile

@@ -33,7 +33,7 @@ h3. using some built-in helpers (mainly for the jenkins-CI)
 Each of the helper script below should work if you have a ruby installation >= 1.9.2 and executed @gem install bundler && bundle install@ in directory where
 
 bc. wiki_pull
-  wiki_pull_daily
+  wiki_pull_and_commit
   wiki_push
 
 h3. in a ruby script

data/history.textile

@@ -1,3 +1,9 @@
+h3. Version 0.5.1 (2015-10-23)
+
+* Cleanup doc
+* Fix an error when fetching doc_de/settings_agenda-druck1
+* Don't accept empty png/jpg files
+
 h3. Version 0.5.0 (2015-09-18)
 
 * Major cleanup, much more spec tests

data/lib/elexis/wiki/images.rb

@@ -43,11 +43,15 @@ module Elexis
           @docs = Dir.glob('**/doc').reject{|x| x.match(/(^vendor|\/vendor)\//) } # doc_fr is mostly a duplicate of doc_de
           @docs.each{
             |doc_dir|
-            pngs = Dir.glob("#{doc_dir}/**/*.{png,jpg}")
+            pngs = Dir.glob("#{doc_dir}/**/*.{png,jpg}", File::FNM_CASEFOLD)
             puts "#{doc_dir} has #{pngs.size} png" if $VERBOSE
             next if pngs.size == 0
             pngs.each {
                       |png|
+                      if File.size(png) == 0
+                        FileUtils.rm_f(png, :verbose => true)
+                        next
+                      end
                       sha256 = Digest::SHA256.hexdigest(IO.read(png))
                       pict = { :sha256 => sha256,
                                :name => File.basename(png),
@@ -58,6 +62,7 @@ module Elexis
             # break if pngs.size > 1
           }
           @sha_2_png = {}
+          @pictures.uniq! { |elem| elem[:path].downcase }
           @pictures.each {
             |picture|
             if @sha_2_png[picture[:sha256]]
@@ -242,7 +247,6 @@ module Elexis
         return unless @add_changes_to_git
         res = system(git_cmd)
         unless res
-          binding.pry
           raise "Running #{git_cmd} failed"
         end
         @actions  << git_cmd

data/lib/elexis/wiki/interface.rb

@@ -48,7 +48,7 @@ module Elexis
         end
 
         def images(page)
-          pages = @mw_gw.images(page)
+          imgs = @mw_gw.images(page).collect{|x| x.gsub(' ','_') }
         end
 
         def users
@@ -118,10 +118,20 @@ module Elexis
           else
             json_url = "#{@wiki_url}?action=query&format=json&list=allimages&ailimit=1&aifrom=#{image.sub(File.extname(image), '')}"
           end
-          json = RestClient.get(json_url)
-          unless json
-            puts "JSON: Could not fetch for image #{image} for #{pageName} using #{json_url}"
-            return
+          begin
+            json = RestClient.get(json_url)
+            unless json
+              msg = "Could not fetch for image #{image} for #{pageName} using #{json_url}"
+              puts "JSON: #{msg}"
+              $ws_errors << msg
+              return
+            end
+          rescue => e
+            msg =  "download_image_file #{image} failed #{e}"
+            puts msg
+            puts e.backtrace.join("\n") if $VERBOSE
+            $ws_errors << msg
+            raise msg
           end
           begin
             answer = JSON.parse(json)

data/lib/elexis/wiki/version.rb

@@ -1,5 +1,5 @@
 module Elexis
   module Wiki
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/elexis/wiki/workspace.rb

@@ -236,8 +236,13 @@ module Elexis
               image_name = File.basename(image)
               m = Wiki::ImagePattern.match(image_name)
               image_name = m[2] if m and not image_name.index('-')
-              @if.download_image_file(image_name, image_name, pageName)
-
+              begin
+                  @if.download_image_file(image_name, image_name, pageName)
+              rescue => e
+                msg = "Failed download #{image_name}"
+                puts msg
+                $ws_errors << msg
+              end
               break if defined?(RSpec) and not /matrix|icpc|ehc/i.match(pageName) # speed up RSpec
           }
         else

data/spec/images_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require "elexis/wiki/images"
 
 describe 'Images' do
-  NR_PICTURES = 23
+  NR_PICTURES = 22
 
   before :all do
     @subdir = 'images'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elexis-wiki-interface
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -371,3 +371,4 @@ test_files:
 - spec/interface_spec.rb
 - spec/pull_spec.rb
 - spec/spec_helper.rb
+has_rdoc: