elexis-wiki-interface 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2648db86e47b0f31d0000cc3a391a5e14f4d2961
-  data.tar.gz: 7215cc7f784d1c6fae10de1415300714670ec7c0
+  metadata.gz: 019d50ea4aa4b5c071d1ed165465ee19cb9531aa
+  data.tar.gz: 9c2ed2aa44fb6b347fc3fbc5213e0ca7931a95f5
 SHA512:
-  metadata.gz: 9cac2544523b57463976dd13a1852898eaf09fdc41a4ce3f1b4611a0be81258e75236c567b15aa5aaa757c391e2ef2594dd36cdc71719341e66d95ee8d56bdea
-  data.tar.gz: eeb844354ed4a01a7f14b3a75e0d58d39ec74fd334201602fb09360503b683e6aa6ce14f171b96c9694418c58b9c41fab2b60faf717cac7972603ef837f76358
+  metadata.gz: 517b5b4354a1821127fab40a167a97497275cb0439140c2a5067b775544f4747647a1a84d0172a8028b119f9193c49f3a75f317c32caa36f4732a1d6f7338f35
+  data.tar.gz: 1b56dcf1ef10e695612db9df15a4042771dc47d2e8b355e5dfe0dc4dcdfe14f80baeaebf3b6aeb56fee9818d0309891262a138b86ecd8f3e7020d7e16b7454e9

data/.gitignore

@@ -16,3 +16,4 @@ test/version_tmp
 tmp
 vendor
 config
+spec/run

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 
 
 gem 'eclipse-plugin' # , :git => 'https://github.com/ngiger/eclipse-plugin'
+# gem 'pry-nav'

data/Gemfile.lock

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

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.4.4 / 14.08.2015
+
+* Check whether all features have an entry in the Matrix_3.0 page
+* Create logical link inside a doc directory. This allows the mylyn preview to work
+* Allow images without a directory in their name.
+
 === 0.4.3 / 07.08.2015
 
 * Use gem eclipse-plugin from rubygem not github

data/bin/wiki_pull_daily

@@ -4,12 +4,12 @@ require 'elexis/wiki/interface/workspace'
 
 workspace =  Elexis::Wiki::Interface::Workspace.new(Dir.pwd)
 workspace.pull
-workspace.show_missing(true)
 files = Dir.glob('doc_??') +
     Dir.glob('*/doc/*.mediawiki') +
     Dir.glob('*/doc/*.png')
     Dir.glob('*/doc/*.jpg')
     Dir.glob('*/doc/*.gif')
+(Dir.glob("doc_??/*") + Dir.glob('*/doc/*')).each{|f| files << f if File.symlink?(f) }
 files.each{
   |file|
   if /:/.match(File.basename(file))
@@ -17,9 +17,12 @@ files.each{
       exit 2
   end
 }
-system("git add -f #{files.join(' ')}")
-system("git status")
-system("git commit --all -m '#{File.basename(__FILE__)}: #{Date.today.to_s} from #{workspace.wiki.sub(/api.php/i, '')}'")
-system("git status")
-system("git log -1")
-# system("git push")
+if true
+  system("git add -f #{files.join(' ')}")
+  system("git status")
+  system("git commit --all -m '#{File.basename(__FILE__)}: #{Date.today.to_s} from #{workspace.wiki.sub(/api.php/i, '')}'")
+  system("git status")
+  system("git log -1")
+  # system("git push")
+end
+workspace.show_missing(true)

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

@@ -1,7 +1,7 @@
 module Elexis
   module Wiki
     module Interface
-      VERSION = "0.4.3"
+      VERSION = "0.4.4"
     end
   end
 end

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

@@ -15,7 +15,7 @@ module Elexis
       $ws_errors = []
 
       # All images under wiki.elexis.info must have images corresponding to the following scheme
-      # directory: id of the plugin/feature (with feature.feature.group removed)
+      # directory (optional): id of the plugin/feature (with feature.feature.group removed)
       # imagename:
       # Therefore you find und http://wiki.elexis.info/index.php?title=Ch.elexis.connect.mythic&action=edit the line
       #   [[Image:ch.elexis.connect.mythic_kabel.png|image]] [fig:kabel]
@@ -24,9 +24,9 @@ module Elexis
 
       def Interface.return_canonical_image_name(pagename, filename)
         pagename = pagename.sub('.feature.feature.group', '')
-        short = File.basename(filename.clone.sub(ImagePrefix, ''))
+        short = File.basename(filename.downcase.sub(ImagePrefix, ''))
         short = short.split(':')[-1]
-        return pagename + '/' + short
+        /[:\/]/.match(filename) ? pagename + '/' + short : short
       end
 
       def Interface.fix_image_locations(filename, pagename)
@@ -45,6 +45,9 @@ module Elexis
             newLines << line
           else
             new_name = Interface.return_canonical_image_name(pagename, m[2])
+            unless new_name.eql?(File.basename(new_name))
+              FileUtils.ln_s('.', File.dirname(new_name), :verbose => true) unless File.exists?(File.dirname(new_name))
+            end
             simpleName = File.join(dirName, File.basename(new_name))
             if files = Dir.glob(simpleName, File::FNM_CASEFOLD) and files.size == 1
               new_line = line.sub(m[2], new_name)
@@ -78,6 +81,12 @@ module Elexis
           @features_missing_documentation     =[]
         end
         def show_missing(details = false)
+          puts
+          msg  = "Show errors for #{@info.workspace_dir}"
+          puts "-" * msg.size
+          puts msg
+          puts "-" * msg.size
+
           if views_missing_documentation.size and
               plugins_missing_documentation.size == 0 and
               features_missing_documentation.size == 0 and
@@ -197,29 +206,34 @@ module Elexis
         end
 
         def pull
+          savedDir = Dir.pwd
           @doc_projects.each{
             |prj|
             dir = File.dirname(prj)
             get_content_from_wiki(dir, File.basename(dir))
             remove_image_files_with_id(File.basename(File.dirname(prj)), info, dir)
-          }
+          } # unless defined?(RSpec)
 
           @info.plugins.each{
             |id, info|
+              # next if not defined?(RSpec) and not /ehc|icp/i.match(id)
               puts "Pulling for plugin #{id}" if $VERBOSE
               pull_docs_views(info)
               pull_docs_plugins(info)
               pull_docs_perspectives(info)
               remove_image_files_with_id(id, info)
           }
+
           @info.features.each{
             |id, info|
-              # next unless /icpc/i.match(id)
+              # next if not defined?(RSpec) and not /ehc|icp/i.match(id)
               puts "Pulling for feature #{id}" if $VERBOSE
+              check_page_in_matrix(id)
               pull_docs_features(info)
               remove_image_files_with_id(id, info)
           }
-          saved = Dir.pwd
+
+          Dir.chdir(savedDir)
         end
 
         def perspectiveToPageName(perspective)
@@ -240,6 +254,13 @@ module Elexis
           pageName
         end
 
+        def check_page_in_matrix(pagename, matrix_name = 'Matrix_3.0')
+          puts Dir.pwd
+          res = get_content_from_wiki('.', matrix_name)
+          return true if res.index("[[#{pagename}]]") or res.index("[[#{pagename}.feature.group]]")
+          $ws_errors << "#{matrix_name}: could not find #{pagename}"
+        end
+
         private
         def wiki_json_timestamp_to_time(json, page_or_img)
           return nil unless json
@@ -294,9 +315,17 @@ module Elexis
                 end
               end
               if image_url
-                      File.open(downloaded_image, 'w') do |file|
-                        file.write(open(image_url).read)
-                      end
+                m = /#{downloaded_image}/i.match(image_url)
+                # downloaded_image = m[0] if m # Sometimes the filename is capitalized
+                File.open(downloaded_image, 'w') do |file|
+                  file.write(open(image_url).read)
+                end
+                files = Dir.glob(downloaded_image, File::FNM_CASEFOLD)
+                files.each{
+                  |file|
+                  next if file.eql?(downloaded_image)
+                  FileUtils.rm_f(file, :verbose => true)
+                  }
               else
                 puts "skipping image #{image} for page #{pageName}"
               end
@@ -313,6 +342,7 @@ module Elexis
           puts "get_content_from_wiki page #{pageName} -> #{out_dir}" if $VERBOSE
           out_name = File.join(out_dir, pageName + '.mediawiki')
           FileUtils.makedirs(out_dir) unless File.directory?(out_dir)
+          savedDir = Dir.pwd
           Dir.chdir(out_dir)
           begin
             content = @mw.get(pageName)
@@ -325,12 +355,13 @@ module Elexis
             @mw.images(pageName).each{
               |image|
                 download_image_file(pageName, image.gsub(' ', '_'))
-                break if defined?(RSpec) and not /icpc/i.match(pageName) # speed up RSpec
+                break if defined?(RSpec) and not /icpc|ehc/i.match(pageName) # speed up RSpec
             }
             Elexis::Wiki::Interface.fix_image_locations(out_name, pageName)
           else
             puts "Could not fetch #{pageName} from #{@mw}" if $VERBOSE
           end
+          Dir.chdir(savedDir)
           content
         end
         def pull_docs_views(plugin)

data/spec/data/.gitignore

@@ -0,0 +1,2 @@
+# Allow
+!*.png

data/spec/data/push/ch.elexis.icpc/doc/test.mediawiki

@@ -12,3 +12,4 @@ tag_five [[Datei:Ch.elexis.icpc:icpc5.png|image]]<br />
 
 
 
+

data/spec/pull_spec.rb

@@ -12,45 +12,40 @@ describe 'Plugin' do
   end
   before :all do
     @dataDir =  File.expand_path(File.join(File.dirname(__FILE__), 'data', 'pull'))
+    @workspace =  Elexis::Wiki::Interface::Workspace.new(@dataDir)
+    @workspace.pull
   end
 
-  before :each do
-    remove_all_mediawiki
-  end
-  
-  after :each do
+  after :all do
     remove_all_mediawiki
   end
 
   it "should pull doc.de ch.elexis.core.ui" do
     # TODO: Handle http://wiki.elexis.info/Doc_de
     # TODO: http://wiki.elexis.info/Doc_de
-    # Nach elexis-3-base?
-#    @dataDir =  File.expand_path(File.join(File.dirname(__FILE__), 'data', 'doc'))
-    workspace =  Elexis::Wiki::Interface::Workspace.new(@dataDir)
-    workspace.pull
     search = "#{@dataDir}/?oc_??/*.mediawiki"
     mediawikis = Dir.glob(search)
     expect(mediawikis.size).to eq 1
   end
 
+  it "should pull views" do
+    expect(@workspace.info.views.size).to eq 9
+    expect(@workspace.views_missing_documentation.size).to be <= 9
+  end
+
   it "should pull all mediawiki content for ch.elexis.core.ui" do
     # TODO: http://wiki.elexis.info/Ch.elexis.core.ui.feature.feature.group
-      workspace =  Elexis::Wiki::Interface::Workspace.new(@dataDir)
-      workspace.pull
-      workspace.info.show
-      expect(workspace.info.views.size).to eq 9
-      expect(workspace.info.preferencePages.size).to eq 8
-      expect(workspace.info.perspectives.size).to eq 2
-      expect(workspace.info.plugins.size).to eq 3
-      expect(workspace.info.features.size).to eq 1
+      @workspace.info.show
+      expect(@workspace.info.preferencePages.size).to eq 8
+      expect(@workspace.info.perspectives.size).to eq 2
+      expect(@workspace.info.plugins.size).to eq 3
+      expect(@workspace.info.features.size).to eq 1
       search = "#{@dataDir}/**/*.mediawiki"
       mediawikis = Dir.glob(search)
       expect(mediawikis.size).to be > 1
-      workspace.show_missing(true)
-      expect(workspace.views_missing_documentation.size).to be <= 9
-      expect(workspace.plugins_missing_documentation.size).to eq 0
-      expect(workspace.perspectives_missing_documentation.size).to be <= 1
+      @workspace.show_missing(true)
+      expect(@workspace.plugins_missing_documentation.size).to eq 0
+      expect(@workspace.perspectives_missing_documentation.size).to be <= 1
       if $VERBOSE
         search = "#{@dataDir}/**/*.mediawiki"
         wiki_files = Dir.glob(search)
@@ -65,6 +60,9 @@ describe 'Plugin' do
 
       name = File.join(@dataDir, "ch.elexis.notes", "doc", "Ch.elexis.notes.mediawiki")
       expect(Dir.glob(name).size).to eq 1
+  end
+
+  it "should pull everything for DOC_DE" do
       search = "#{@dataDir}/**/doc/*.png"
       images = Dir.glob(search)
       images.each{
@@ -72,8 +70,10 @@ describe 'Plugin' do
         expect(/:/.match(img)).to be_nil
       }
       expect(images.size).to be >= 1
-      expect(workspace.features_missing_documentation.size).to eq 0
+      expect(@workspace.features_missing_documentation.size).to eq 0
+  end
 
+  it "should pull everything for ICPC" do
       name = File.join(@dataDir, "ch.elexis.icpc", "doc", "P_ICPC.mediawiki")
       expect(Dir.glob(name).size).to eq 1
       name = File.join(@dataDir, "ch.elexis.icpc", "doc", "ChElexisIcpcViewsEpisodesview.mediawiki")
@@ -83,13 +83,23 @@ describe 'Plugin' do
       content = IO.read(name)
       m = /(Image:[\w\.]+)[:_](\w+.png)/.match(content)
       expect(m).to eq nil
-      m = /(Image:[\w\.]+)\/(\w+.png)/.match(content)
+      m = /(Image:[\w\.]+)\/(icpc0.png)/i.match(content)
       expect(m[0]).to eq 'Image:Ch.elexis.icpc/icpc0.png'
   end
 
   it "should show all users" do
-    workspace =  Elexis::Wiki::Interface::Workspace.new(@dataDir)
-    puts "We have #{workspace.mw.users.size} wiki users"
+    @workspace =  Elexis::Wiki::Interface::Workspace.new(@dataDir)
+    puts "We have #{@workspace.mw.users.size} wiki users"
+  end unless ENV['TRAVIS']
+
+  it "should check the matrix" do
+    @workspace.info.show
+    $ws_errors = []
+    @workspace.check_page_in_matrix('ch.elexis.notes.feature.feature.group')
+    expect($ws_errors.size).to eq 0
+    $ws_errors = []
+    @workspace.check_page_in_matrix('xxxxxxxxx')
+    expect($ws_errors.size).to eq 1
   end
 
 end

data/spec/update_images_spec.rb

@@ -42,7 +42,7 @@ describe 'ImageHandling' do
     }
   end
 
-  it "should adapt correctly the image name" do
+  it "should adapt correctly the image name being in in #{Dir.pwd}" do
     wiki_file = File.join(@dataDir, 'ch.elexis.icpc', 'doc', 'test.mediawiki')
     expect(File.exists?(wiki_file)).to eq true
     before =  ['tag_one [[Image:ch.elexis.icpc:icpc1.png|image]]',
@@ -53,19 +53,33 @@ describe 'ImageHandling' do
                 ]
     original = IO.read(wiki_file)
     before.each{|string| expect(original).to include string }
-    puts Dir.pwd
+  end
+
+  it "should adapt correctly the image name being in #{@dataDir}" do
+    wiki_file = File.join(@dataDir, 'ch.elexis.icpc', 'doc', 'test.mediawiki')
     Dir.chdir(@dataDir)
-    puts Dir.pwd
 
     Elexis::Wiki::Interface.fix_image_locations(wiki_file, 'ch.elexis.icpc')
     after =['tag_one [[Image:ch.elexis.icpc/icpc1.png|image]]',
       'tag_two [[Image:ch.elexis.icpc/icpc2.png|image]]',
-      'tag_three [[Image:ch.elexis.icpc/icpc3.png|image]]',
+      'tag_three [[Image:icpc3.png|image]]',
       'tag_four [[Datei:ch.elexis.icpc/icpc4.png|image]]',
       'tag_five [[Datei:ch.elexis.icpc/icpc5.png|image]]',
                 ]
     changed = IO.read(wiki_file)
     after.each{|string| expect(changed).to include string }
   end
+
+  it "should adapt allow the image names without an ID" do
+    wiki_file = File.join(@dataDir, 'ch.elexis.icpc', 'doc', 'test.mediawiki')
+    Dir.chdir(@dataDir)
+
+    Elexis::Wiki::Interface.fix_image_locations(wiki_file, 'ch.elexis.icpc')
+    after =['tag_three [[Image:icpc3.png|image]]',
+            ]
+    changed = IO.read(wiki_file)
+    after.each{|string| expect(changed).to include string }
+  end
+
 end
 

data/spec/user_spec.rb

@@ -0,0 +1,32 @@
+#encoding : utf-8
+require 'spec_helper'
+
+require 'elexis/wiki/interface'
+require "elexis/wiki/interface/workspace"
+describe 'Plugin' do
+
+  def remove_all_mediawikii
+    files2rm = Dir.glob("#{@dataDir}/**/*.mediawiki") + Dir.glob("#{@dataDir}/**/*.png")
+    FileUtils.rm(files2rm, :verbose => $VERBOSE) if files2rm.size > 0
+  end
+  before :all do
+    @dataDir =  File.expand_path(File.join(File.dirname(__FILE__), 'data', 'pull'))
+  end
+
+  before :each do
+    remove_all_mediawikii
+  end
+  
+  after :each do
+    remove_all_mediawikii
+  end
+
+  it "should show all users" do
+    workspace =  Elexis::Wiki::Interface::Workspace.new(@dataDir)
+    wiki_users = workspace.mw.users
+    puts "We have #{wiki_users.size} wiki users"
+    expect wiki_users.size <= 50
+    contribs = workspace.mw.contributions(wiki_users.first)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elexis-wiki-interface
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -147,6 +147,7 @@ files:
 - lib/elexis/wiki/interface.rb
 - lib/elexis/wiki/interface/version.rb
 - lib/elexis/wiki/interface/workspace.rb
+- spec/data/.gitignore
 - spec/data/doc/doc_de/.project
 - spec/data/pull/ch.elexis.agenda/.project
 - spec/data/pull/ch.elexis.agenda/META-INF/MANIFEST.MF
@@ -189,6 +190,7 @@ files:
 - spec/run/push/ch.elexis.icpc/doc/icpc5.png
 - spec/spec_helper.rb
 - spec/update_images_spec.rb
+- spec/user_spec.rb
 homepage: http://wiki.elexis.info
 licenses:
 - GPLv3
@@ -214,6 +216,7 @@ signing_key:
 specification_version: 4
 summary: Interface between elexis source and wiki
 test_files:
+- spec/data/.gitignore
 - spec/data/doc/doc_de/.project
 - spec/data/pull/ch.elexis.agenda/.project
 - spec/data/pull/ch.elexis.agenda/META-INF/MANIFEST.MF
@@ -256,3 +259,4 @@ test_files:
 - spec/run/push/ch.elexis.icpc/doc/icpc5.png
 - spec/spec_helper.rb
 - spec/update_images_spec.rb
+- spec/user_spec.rb