elexis-wiki-interface 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a22080740e70d432d3c23490a767c09d9e3e1aa4
-  data.tar.gz: a6a7cba8a7d6819359bde4177ca77c583ecddab4
+SHA256:
+  metadata.gz: b8c7d5f2491911521d39a28fb89de4202447f813d96bb4b8a4fa4de5666efc9f
+  data.tar.gz: 2926d9b8505ca918d3e64767acc01b8832810be556c4345daad023fcdf6188f5
 SHA512:
-  metadata.gz: a9de7f09eed4191114276f7a780fd2bc3802cf02b485c14715ac8a9714810915585ecd5f33a279b9d0a6a913111065399b1859632d85953ba3ff7b49a8cd6f3b
-  data.tar.gz: 071d6a9a0f209410505b08953bf0ed6361dfcbaad6624f8d5f6794fb361977ea72cdc37a5fa33c28e4ee2a7866a3fdf1e74f8c8c1ed4f67af4749e7870ba7db9
+  metadata.gz: 42d3f5da17f8eece34dcc0e119209480dc883538ebb0258ffbca29a817034177cba0a396fcfe0eaaece1a4b91a701d7e11f2d86d57e32f1a0601d15e95f63e47
+  data.tar.gz: 321081c4553c55e84f3e3869439160d48e146bb8a307de3991d619e7a10c8ea9cd35711a478e88e7e62c27456228db77c8c90adf88eaf6a01c9b0838adbfe466

data/Gemfile

@@ -3,9 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in elexis-wiki-interface.gemspec
 gemspec
 
-
-gem 'eclipse-plugin',   '>= 0.4.2'# , :path => '/opt/rm/eclipse-plugin' #, '>= 0.5.4'
-
 group :debugger do
   gem 'pry-byebug'
 end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    elexis-wiki-interface (0.5.6)
-      eclipse-plugin (>= 0.4.2)
+    elexis-wiki-interface (0.5.7)
+      eclipse-plugin (>= 0.4.3)
       mediawiki-butt
       rest-client (~> 2.0)
       rubyzip (~> 1.2.1)
@@ -17,7 +17,7 @@ GEM
     docile (1.3.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    eclipse-plugin (0.4.2)
+    eclipse-plugin (0.4.3)
       nokogiri
       rubyzip (~> 1.2.1)
     http-cookie (1.0.3)
@@ -27,9 +27,9 @@ GEM
     mediawiki-butt (3.0.0)
       httpclient (~> 2.8)
     method_source (0.9.0)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mini_portile2 (2.3.0)
     netrc (0.11.0)
     nokogiri (1.8.4)
@@ -74,7 +74,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.10)
-  eclipse-plugin (>= 0.4.2)
   elexis-wiki-interface!
   pry-byebug
   rake (~> 10.0)
@@ -82,4 +81,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

data/elexis-wiki-interface.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'unicode'
   spec.add_dependency 'mediawiki-butt'
   spec.add_dependency 'rest-client', '~> 2.0'
-  spec.add_dependency 'eclipse-plugin', '>= 0.4.2'
+  spec.add_dependency 'eclipse-plugin', '>= 0.4.3'
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"

data/history.textile

@@ -1,3 +1,16 @@
+h3. Version 0.5.6 (2018-08-30)
+
+* Fixed getting features
+* cleanup warnings, by updating to newer version of eclipse-plugin
+
+h3. Version 0.5.5 (2018-08-10)
+
+* Adapted to pomless structure
+
+h3. Version 0.5.4 (2017-11-17)
+
+* Update rubyzip
+
 h3. Version 0.5.3 (2015-10-29)
 
 * Remove dummy UTF-8 characters

data/lib/elexis/wiki/interface.rb

@@ -22,8 +22,8 @@ module Elexis
             @password = 'nopassword'
           else
             possibleCfgs = [File.join(Dir.pwd, 'config.yml'), '/etc/elexis-wiki-interface/config.yml', ]
-            possibleCfgs.each{ |cfg| @config_yml = cfg; break if File.exists?(cfg) }
-            raise "need a config file #{possibleCfgs.join(' or ')} for wiki with user/password" unless File.exists?(@config_yml)
+            possibleCfgs.each{ |cfg| @config_yml = cfg; break if File.exist?(cfg) }
+            raise "need a config file #{possibleCfgs.join(' or ')} for wiki with user/password" unless File.exist?(@config_yml)
             yaml = YAML.load_file(@config_yml)
             @wiki_url = wiki_url
             @wiki_url ||= defined?(RSpec) ? yaml['test_wiki'] : yaml['wiki']
@@ -147,12 +147,12 @@ module Elexis
             end
             rescue => e
               puts "JSON: Could not fetch for image #{image} for #{pageName} using #{json_url}"
-              FileUtils.rm_f(image) if File.exists?(image) and File.size(image) == 0
+              FileUtils.rm_f(image) if File.exist?(image) and File.size(image) == 0
               puts "      was '#{json}'"
               puts "      error was #{e.inspect}"
           end
         end
-        puts "Downloaded image #{destination} #{File.size(destination)} bytes" if $VERBOSE and File.exists?(destination)
+        puts "Downloaded image #{destination} #{File.size(destination)} bytes" if $VERBOSE and File.exist?(destination)
       end
     end
   end

data/lib/elexis/wiki/version.rb

@@ -1,5 +1,5 @@
 module Elexis
   module Wiki
-    VERSION = "0.5.6"
+    VERSION = "0.5.7"
   end
 end

data/lib/elexis/wiki/workspace.rb

@@ -26,6 +26,7 @@ module Elexis
         @info.parse_sub_dirs
         @info.show if $VERBOSE
         @views_missing_documentation        =[]
+        @views_with_documentation           =[]
         @perspectives_missing_documentation =[]
         @features_missing_documentation     =[]
       end
@@ -42,7 +43,7 @@ module Elexis
             perspectives_missing_documentation.size == 0
           puts "Eclipse-Workspace #{@info.workspace_dir} seems to have documented all views, features, plugins and perspectives"
         else
-          puts "Eclipse-Workspace #{@info.workspace_dir} needs documenting "
+          puts "Eclipse-Workspace #{@info.workspace_dir} has #{@views_with_documentation.size} documented views, but needs documenting "
           if views_missing_documentation.size > 0
             puts "  #{views_missing_documentation.size} views"
             puts "    #{views_missing_documentation.inspect}" if details
@@ -256,9 +257,10 @@ module Elexis
         plugin.views.each{
           |id, view|
           pageName = viewToPageName(plugin.symbolicName, view)
-          content = get_content_from_wiki(File.join(@info.workspace_dir, File.basename(plugin.jar_or_src), 'doc'), pageName)
+          content = get_content_from_wiki(File.join(plugin.workspace, File.basename(plugin.jar_or_src), 'doc'), pageName)
           next if TestPattern.match(id)
           @views_missing_documentation << pageName unless content
+          @views_with_documentation  << pageName if content
         }
       end
       def pull_docs_perspectives(plugin)
@@ -266,7 +268,7 @@ module Elexis
         plugin.perspectives.each{
           |id, perspective|
           pageName = perspectiveToPageName(perspective)
-          content = get_content_from_wiki(File.join(@info.workspace_dir, File.basename(plugin.jar_or_src), 'doc'), pageName)
+          content = get_content_from_wiki(File.join(plugin.workspace, File.basename(plugin.jar_or_src), 'doc'), pageName)
           next if TestPattern.match(id)
           @perspectives_missing_documentation << pageName unless content
         }
@@ -274,15 +276,16 @@ module Elexis
       def pull_docs_plugins(plugin)
         id = plugin.symbolicName
         pageName = id.capitalize
-        content = get_content_from_wiki(File.join(@info.workspace_dir, File.basename(plugin.jar_or_src), 'doc'), pageName)
+        content = get_content_from_wiki(File.join(plugin.workspace, File.basename(plugin.jar_or_src), 'doc'), pageName)
         return if TestPattern.match(id)
       end
       def pull_docs_features(feature)
         id = feature.symbolicName
         pageName = id.capitalize
-        content = get_content_from_wiki(File.join(@info.workspace_dir, id, 'doc'), pageName)
+        feature_dir  = feature.workspace || File.join( @info.workspace_dir, id)
+        content = get_content_from_wiki(File.join(feature_dir, 'doc'), pageName)
         unless content
-          content = get_content_from_wiki(File.join(@info.workspace_dir, id, 'doc'), pageName.sub(/feature$/, 'feature.feature.group'))
+          content = get_content_from_wiki(File.join(feature_dir, 'doc'), pageName.sub(/feature$/, 'feature.feature.group'))
           puts "pull_docs_features failed #{id} #{pageName}" unless content
         end
       end

data/spec/pull_spec.rb

@@ -50,14 +50,13 @@ describe 'Plugin' do
         wiki_files = Dir.glob(search)
         puts "We have the pulled the following wiki_files\n#{wiki_files.join("\n")}"
       end
-      name = File.join(@dataDir, "ch.elexis.core.application.feature", "Ch.elexis.core.application.feature.feature.group.mediawiki")
+      name = File.join(@dataDir, "features", "ch.elexis.core.application.feature", "Ch.elexis.core.application.feature.feature.group.mediawiki")
       expect(Dir.glob(name).size).to eq 0
-      name = File.join(@dataDir, "ch.elexis.agenda", "doc", "Ch.elexis.agenda.mediawiki")
+      name = File.join(@dataDir, "bundles", "ch.elexis.agenda", "doc", "Ch.elexis.agenda.mediawiki")
       expect(Dir.glob(name).size).to eq 1
-      name = File.join(@dataDir, "ch.elexis.agenda", "*.mediawiki")
+      name = File.join(@dataDir, "bundles", "ch.elexis.agenda", "*.mediawiki")
       expect(Dir.glob(name).size).to eq(0)
-
-      name = File.join(@dataDir, "ch.elexis.notes", "doc", "Ch.elexis.notes.mediawiki")
+      name = File.join(@dataDir, "bundles", "ch.elexis.notes", "doc", "Ch.elexis.notes.mediawiki")
       expect(Dir.glob(name).size).to eq 1
   end
 
@@ -74,11 +73,11 @@ describe 'Plugin' do
   end
 
   it "should pull everything for ICPC" do
-      name = File.join(@dataDir, "ch.elexis.icpc", "doc", "P_ICPC.mediawiki")
+      name = File.join(@dataDir, "bundles", "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")
+      name = File.join(@dataDir, "bundles", "ch.elexis.icpc", "doc", "ChElexisIcpcViewsEpisodesview.mediawiki")
       expect(Dir.glob(name).size).to eq 1
-      name = File.join(@dataDir, "ch.elexis.icpc", "doc", "Ch.elexis.icpc.mediawiki")
+      name = File.join(@dataDir, "bundles", "ch.elexis.icpc", "doc", "Ch.elexis.icpc.mediawiki")
       expect(Dir.glob(name).size).to eq 1
       content = IO.read(name)
       skip('test forimages for icpc no longer working')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elexis-wiki-interface
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -219,29 +219,29 @@ files:
 - spec/data/images/doc_de/.project
 - spec/data/images/doc_de/doc_de
 - spec/data/images/elexis_api_test.png
-- spec/data/pull/ch.elexis.agenda/.project
-- spec/data/pull/ch.elexis.agenda/META-INF/MANIFEST.MF
-- spec/data/pull/ch.elexis.agenda/plugin.properties
-- spec/data/pull/ch.elexis.agenda/plugin.xml
-- spec/data/pull/ch.elexis.agenda/plugin_de.properties
-- spec/data/pull/ch.elexis.agenda/plugin_en.properties
-- spec/data/pull/ch.elexis.agenda/plugin_fr.properties
-- spec/data/pull/ch.elexis.core.application.feature/.project
-- spec/data/pull/ch.elexis.core.application.feature/build.properties
-- spec/data/pull/ch.elexis.core.application.feature/feature.xml
-- spec/data/pull/ch.elexis.core.application.feature/pom.xml
-- spec/data/pull/ch.elexis.icpc/.project
-- spec/data/pull/ch.elexis.icpc/META-INF/MANIFEST.MF
-- spec/data/pull/ch.elexis.icpc/plugin.xml
-- spec/data/pull/ch.elexis.notes/.project
-- spec/data/pull/ch.elexis.notes/META-INF/MANIFEST.MF
-- spec/data/pull/ch.elexis.notes/plugin.properties
-- spec/data/pull/ch.elexis.notes/plugin.xml
-- spec/data/pull/ch.elexis.notes/plugin_de.properties
-- spec/data/pull/ch.elexis.notes/plugin_en.properties
-- spec/data/pull/ch.elexis.notes/plugin_fr.properties
+- spec/data/pull/bundles/ch.elexis.agenda/.project
+- spec/data/pull/bundles/ch.elexis.agenda/META-INF/MANIFEST.MF
+- spec/data/pull/bundles/ch.elexis.agenda/plugin.properties
+- spec/data/pull/bundles/ch.elexis.agenda/plugin.xml
+- spec/data/pull/bundles/ch.elexis.agenda/plugin_de.properties
+- spec/data/pull/bundles/ch.elexis.agenda/plugin_en.properties
+- spec/data/pull/bundles/ch.elexis.agenda/plugin_fr.properties
+- spec/data/pull/bundles/ch.elexis.icpc/.project
+- spec/data/pull/bundles/ch.elexis.icpc/META-INF/MANIFEST.MF
+- spec/data/pull/bundles/ch.elexis.icpc/plugin.xml
+- spec/data/pull/bundles/ch.elexis.notes/.project
+- spec/data/pull/bundles/ch.elexis.notes/META-INF/MANIFEST.MF
+- spec/data/pull/bundles/ch.elexis.notes/plugin.properties
+- spec/data/pull/bundles/ch.elexis.notes/plugin.xml
+- spec/data/pull/bundles/ch.elexis.notes/plugin_de.properties
+- spec/data/pull/bundles/ch.elexis.notes/plugin_en.properties
+- spec/data/pull/bundles/ch.elexis.notes/plugin_fr.properties
 - spec/data/pull/doc_de/.project
 - spec/data/pull/doc_de/doc_de
+- spec/data/pull/features/ch.elexis.core.application.feature/.project
+- spec/data/pull/features/ch.elexis.core.application.feature/build.properties
+- spec/data/pull/features/ch.elexis.core.application.feature/feature.xml
+- spec/data/pull/features/ch.elexis.core.application.feature/pom.xml
 - spec/data/push/ch.elexis.core.application/doc/ChElexisViewsBestellblatt.mediawiki
 - spec/data/push/ch.elexis.icpc/.project
 - spec/data/push/ch.elexis.icpc/META-INF/MANIFEST.MF
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Interface between elexis source and wiki
@@ -342,29 +342,29 @@ test_files:
 - spec/data/images/doc_de/.project
 - spec/data/images/doc_de/doc_de
 - spec/data/images/elexis_api_test.png
-- spec/data/pull/ch.elexis.agenda/.project
-- spec/data/pull/ch.elexis.agenda/META-INF/MANIFEST.MF
-- spec/data/pull/ch.elexis.agenda/plugin.properties
-- spec/data/pull/ch.elexis.agenda/plugin.xml
-- spec/data/pull/ch.elexis.agenda/plugin_de.properties
-- spec/data/pull/ch.elexis.agenda/plugin_en.properties
-- spec/data/pull/ch.elexis.agenda/plugin_fr.properties
-- spec/data/pull/ch.elexis.core.application.feature/.project
-- spec/data/pull/ch.elexis.core.application.feature/build.properties
-- spec/data/pull/ch.elexis.core.application.feature/feature.xml
-- spec/data/pull/ch.elexis.core.application.feature/pom.xml
-- spec/data/pull/ch.elexis.icpc/.project
-- spec/data/pull/ch.elexis.icpc/META-INF/MANIFEST.MF
-- spec/data/pull/ch.elexis.icpc/plugin.xml
-- spec/data/pull/ch.elexis.notes/.project
-- spec/data/pull/ch.elexis.notes/META-INF/MANIFEST.MF
-- spec/data/pull/ch.elexis.notes/plugin.properties
-- spec/data/pull/ch.elexis.notes/plugin.xml
-- spec/data/pull/ch.elexis.notes/plugin_de.properties
-- spec/data/pull/ch.elexis.notes/plugin_en.properties
-- spec/data/pull/ch.elexis.notes/plugin_fr.properties
+- spec/data/pull/bundles/ch.elexis.agenda/.project
+- spec/data/pull/bundles/ch.elexis.agenda/META-INF/MANIFEST.MF
+- spec/data/pull/bundles/ch.elexis.agenda/plugin.properties
+- spec/data/pull/bundles/ch.elexis.agenda/plugin.xml
+- spec/data/pull/bundles/ch.elexis.agenda/plugin_de.properties
+- spec/data/pull/bundles/ch.elexis.agenda/plugin_en.properties
+- spec/data/pull/bundles/ch.elexis.agenda/plugin_fr.properties
+- spec/data/pull/bundles/ch.elexis.icpc/.project
+- spec/data/pull/bundles/ch.elexis.icpc/META-INF/MANIFEST.MF
+- spec/data/pull/bundles/ch.elexis.icpc/plugin.xml
+- spec/data/pull/bundles/ch.elexis.notes/.project
+- spec/data/pull/bundles/ch.elexis.notes/META-INF/MANIFEST.MF
+- spec/data/pull/bundles/ch.elexis.notes/plugin.properties
+- spec/data/pull/bundles/ch.elexis.notes/plugin.xml
+- spec/data/pull/bundles/ch.elexis.notes/plugin_de.properties
+- spec/data/pull/bundles/ch.elexis.notes/plugin_en.properties
+- spec/data/pull/bundles/ch.elexis.notes/plugin_fr.properties
 - spec/data/pull/doc_de/.project
 - spec/data/pull/doc_de/doc_de
+- spec/data/pull/features/ch.elexis.core.application.feature/.project
+- spec/data/pull/features/ch.elexis.core.application.feature/build.properties
+- spec/data/pull/features/ch.elexis.core.application.feature/feature.xml
+- spec/data/pull/features/ch.elexis.core.application.feature/pom.xml
 - spec/data/push/ch.elexis.core.application/doc/ChElexisViewsBestellblatt.mediawiki
 - spec/data/push/ch.elexis.icpc/.project
 - spec/data/push/ch.elexis.icpc/META-INF/MANIFEST.MF