elexis-wiki-interface 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1af9634489e62b4b68be7683c5711ea4f29cf403
-  data.tar.gz: f8d6689239f46763698749f8b4dd0e2a575dcaf6
+  metadata.gz: a27ca6c8e67c1799da5fb5f6176e29c0c95f2255
+  data.tar.gz: 58003985adff2d92617f3bb9589690c55c64c0b1
 SHA512:
-  metadata.gz: 791b7f0da48c69730dabde66490ec12fdca8a509cdb5f1987c41e9216045615156e077f20aa9334cec519da207bbbb0054b12546dc031453105d43fadedf1551
-  data.tar.gz: 6c1ac1fdb2cd40507b3cfcd811d9d4df77311afcd70bb3c2c3b9e98d5731b7c7e4028f8919e5daf9d074023c4877736d5304b0f6cd35b4e5a8ef170e349dae0f
+  metadata.gz: 059bda68058a59f66691354485911467a8985f00d653fee16688eb99a5bf763b8c8616b0c47e08c211967983082acf8a31ff6c383a6a62cc27d0176516b69dae
+  data.tar.gz: 593654fe086c69ed7f3a4ddba20e68223f2989a249b5174ec90e0f2ccecaacdf112cbf04dafdddf7f4e175eb3b20d40506efcb5404cdea1e5e03615733c81696

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elexis-wiki-interface (0.4.6)
+    elexis-wiki-interface (0.4.7)
       eclipse-plugin (>= 0.1)
       mediawiki-gateway
       rubyzip (< 1.0.0)

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.4.7 / 15.08.2015
+
+* Push features, too
+
 === 0.4.6 / 15.08.2015
 
 * Replace [[Datei:|[[Image: by [[File:

data/lib/elexis/wiki/interface/version.rb

@@ -1,7 +1,7 @@
 module Elexis
   module Wiki
     module Interface
-      VERSION = "0.4.6"
+      VERSION = "0.4.7"
     end
   end
 end

data/lib/elexis/wiki/interface/workspace.rb

@@ -113,6 +113,67 @@ module Elexis
           puts $ws_errors
           puts "Displayed #{$ws_errors.size} errors"
         end
+        def push_plugin_or_feature(id, info)
+          docDir = File.join(@info.workspace_dir, id, 'doc')
+          to_push = Dir.glob("#{docDir}/*.mediawiki")
+          to_push.each{
+                |file|
+                # verify that locally committed file is newer than the page in the wiki
+                # verify that the content after the push matches the local content
+                my_new_content = File.new(file).read
+                to_verify = my_new_content.gsub(/\n+/,"\n").chomp
+                pagename = File.basename(file, '.mediawiki').capitalize
+                last_wiki_modification = get_page_modification_time(pagename)
+                last_git_modification = get_git_modification(file)
+                unless last_wiki_modification
+                  puts "first upload #{File.basename(file)} last_git_modification is #{last_git_modification}" if $VERBOSE
+                  @mw.create(pagename, my_new_content,{:overwrite => true, :summary => "pushed by #{File.basename(__FILE__)}" })
+                else
+                  got = @mw.get(pagename).gsub(/\n+/,"\n")
+                  if got == to_verify
+                    puts "No changes to push for #{file}"
+                    next
+                  end
+                  @mw.edit(pagename, to_verify,{:overwrite => true, :summary => "pushed by #{File.basename(__FILE__)}" })
+                  puts "Uploaded #{file} to #{pagename}" if $VERBOSE
+                end
+            }
+          if to_push.size > 0 # then upload also all *.png files
+            images_to_push = Dir.glob("#{docDir}/*.png")
+            images_to_push.each{
+                              |image|
+                            if /:/.match(File.basename(image))
+                                puts "You may not add a file containg ':' or it will break git for Windows. Remove/rename #{image}"
+                                exit
+                            end
+
+                            git_mod   = get_git_modification(image)
+                            wiki_mod  = get_image_modification_name(image)
+
+                            if wiki_mod == nil
+                              puts "first upload #{File.basename(image)} as last_git_modification is #{git_mod}" if $VERBOSE
+                            else
+                              to_verify = File.new(image, 'rb').read
+                              got       = @mw.get(File.basename(image))
+                              if got == to_verify
+                                puts "nothing to upload for #{image}" if $VERBOSE
+                                next
+                              end
+                            end
+                            begin
+                              res = @mw.upload(image, 'filename' => File.basename(image))
+                              puts "res für #{image}  exists? #{File.exists?(image)} ist #{res.to_s}" if $VERBOSE
+                            rescue MediaWiki::APIError => e
+                              puts "rescue für #{image} #{e}" #  if $VERBOSE
+                              if /verification-error/.match(e.to_s)
+                                puts "If you received API error: code 'verification-error', info 'This file did not pass file verification'"
+                                puts "this means that the file type and content do not match, e.g. you have a *png file but in reality it is a JPEG file."
+                                puts "In this case convert file.png file.png fixes this problem"
+                              end
+                            end
+            }
+          end
+        end
         def push
           check_config_file
           raise "must define wiki with user and password in #{@config_yml}" unless @user and @password and @wiki
@@ -121,66 +182,13 @@ module Elexis
             |prj|
             dir = File.dirname(prj)
           }
+          @info.features.each{
+            |id, info|
+              push_plugin_or_feature(id, info)
+          }
           @info.plugins.each{
             |id,plugin|
-              to_push = Dir.glob("#{plugin.jar_or_src}/doc/*.mediawiki")
-              to_push.each{
-                           |file|
-                            # verify that locally committed file is newer than the page in the wiki
-                            # verify that the content after the push matches the local content
-                            my_new_content = File.new(file).read
-                            to_verify = my_new_content.gsub(/\n+/,"\n").chomp
-                            pagename = File.basename(file, '.mediawiki').capitalize
-                            last_wiki_modification = get_page_modification_time(pagename)
-                            last_git_modification = get_git_modification(file)
-                            unless last_wiki_modification
-                              puts "first upload #{File.basename(file)} last_git_modification is #{last_git_modification}" if $VERBOSE
-                              @mw.create(pagename, my_new_content,{:overwrite => true, :summary => "pushed by #{File.basename(__FILE__)}" })
-                            else
-                              got = @mw.get(pagename).gsub(/\n+/,"\n")
-                              if got == to_verify
-                                puts "No changes to push for #{file}"
-                                next
-                              end
-                              @mw.edit(pagename, to_verify,{:overwrite => true, :summary => "pushed by #{File.basename(__FILE__)}" })
-                              puts "Uploaded #{file} to #{pagename}" if $VERBOSE
-                            end
-                        }
-              if to_push.size > 0 # then upload also all *.png files
-                images_to_push = Dir.glob("#{plugin.jar_or_src}/doc/*.png")
-                images_to_push.each{
-                                 |image|
-                                if /:/.match(File.basename(image))
-                                   puts "You may not add a file containg ':' or it will break git for Windows. Remove/rename #{image}"
-                                   exit
-                                end
-
-                                git_mod   = get_git_modification(image)
-                                wiki_mod  = get_image_modification_name(image)
-
-                                if wiki_mod == nil
-                                  puts "first upload #{File.basename(image)} as last_git_modification is #{git_mod}" if $VERBOSE
-                                else
-                                  to_verify = File.new(image, 'rb').read
-                                  got       = @mw.get(File.basename(image))
-                                  if got == to_verify
-                                    puts "nothing to upload for #{image}" if $VERBOSE
-                                    next
-                                  end
-                                end
-                                begin
-                                  res = @mw.upload(image, 'filename' => File.basename(image))
-                                  puts "res für #{image}  exists? #{File.exists?(image)} ist #{res.to_s}" if $VERBOSE
-                                rescue MediaWiki::APIError => e
-                                  puts "rescue für #{image} #{e}" #  if $VERBOSE
-                                  if /verification-error/.match(e.to_s)
-                                    puts "If you received API error: code 'verification-error', info 'This file did not pass file verification'"
-                                    puts "this means that the file type and content do not match, e.g. you have a *png file but in reality it is a JPEG file."
-                                    puts "In this case convert file.png file.png fixes this problem"
-                                  end
-                                end
-                }
-            end
+              push_plugin_or_feature(id, plugin)
           }
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elexis-wiki-interface
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Niklaus Giger