wikian 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 274ce53f95d131fe76efaecadf8b9ca1636c67922da81b6eab395645efa83b3b
-  data.tar.gz: 5fc02ffd5461eeb7fb28686fc3defaa2046db44dd0feb479969e1106fb906648
+  metadata.gz: 66726501f7fd096888803fc73c97612ef35b26e3246c54c4f9fbb7ea887c9d78
+  data.tar.gz: 9cda60a1184cb39a79cec8a93cb36fba2cde382bb7d1d69ca7d1beb79f36dc4e
 SHA512:
-  metadata.gz: 18211cf13b7adb90cdc92356e77f5fc776c869affabace2255be366e54048f25be37e89240490f3687aa4dab53a64e14f554329eb65c4158aa0c2226542d6876
-  data.tar.gz: abe6b447651e7c884c04f1c62f6ab481cdf06915dbea677259664658cf249fda086da23418a2b34906e4db15eb3078a86e24ca4459e4922960d742df9b96b50f
+  metadata.gz: 5370603bfe66ffe85be969cbb5eadcd4f96dedcc59c594effb81f76c1b7538ba9588f822e7ef50c52c04a46e54217e086d93cd64cda742607018d1e5c9d81dc9
+  data.tar.gz: b9039ccf6311700d85ce6b80f62a8a9238e08ba3727a684e82764ace39778975bff5f543932e91b84749f1e094e89cef68a671d24607026fab75300366d3a85c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wikian (0.2.1)
+    wikian (0.2.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/wikian.rb

@@ -78,6 +78,7 @@ class Wikian
         -a, --append               append the input file
         -c, --captcha ID:MESSAGE   captcha info
         -d, --debug                print debugging messages
+        -f, --force                force post (this ignores edit conflicts)
         -h, --help                 print this help message
         -m, --message MESSAGE      add a commit message (HIGHLY recommended)
         -p, --prepend              prepend the input file

data/lib/wikian/contributions.rb

@@ -21,7 +21,7 @@ class Wikian
 
       @api_url = URI("https://#{config['meta']['site']}/w/api.php?#{query}")
     rescue => e
-      puts "#{e.class} in #{__FILE__}. #{e.message}"
+      puts "#{e.class} in #{__FILE__}", e.message
       exit
     end
 

data/lib/wikian/get.rb

@@ -24,7 +24,7 @@ class Wikian
 
       @api_url = URI("https://#{url.host}/w/api.php?#{query}")
     rescue => e
-      puts "#{e.class} in #{__FILE__}. #{e.message}"
+      puts "#{e.class} in #{__FILE__}", e.message
       exit
     end
 

data/lib/wikian/post.rb

@@ -28,7 +28,7 @@ class Wikian
 
       @debug = (args & %w(-d)).length > 0 ? true : false
     rescue => e
-      puts "#{e.class} in #{__FILE__}. #{e.message}"
+      puts "#{e.class} in #{__FILE__}", e.message
       exit
     end
 
@@ -55,9 +55,9 @@ class Wikian
 
       get_latest_revision
 
-      if @body_text &&  Time.parse(params['starttimestamp']) < Time.parse(params['basetimestamp'])
-        puts "\e[31mEdit conflict detected, merging with latest version\e[m"
-        merge_versions
+      if !args.include?('-f') && @body_text &&  Time.parse(params['starttimestamp']) < Time.parse(params['basetimestamp'])
+        puts "Edit conflict detected"
+        merge_versions(@body_text, latest_content)
       end
 
       get_csrf_token
@@ -131,7 +131,7 @@ class Wikian
           timestamp
         else
           FileUtils.mkdir_p(Wikian.meta_dir)
-          metadata = {'meta' => {'title'  => {'timestamp' => File.ctime(input_file).utc.iso8601}}}
+          metadata = {'meta' => {'title'  => {'timestamp' => File.mtime(input_file).utc.iso8601}}}
           File.write(Wikian.meta_file, YAML.dump(metadata))
         end
       wikitext = File.read(input_file)
@@ -154,16 +154,30 @@ class Wikian
       end
     end
 
-    def merge_versions
-      tmp_local = Tempfile.open {|f| f.write @body_text; f}
-      tmp_latest = Tempfile.open {|f| f.write latest_content; f}
-      @body_text = %x(diff --line-format %L #{tmp_local.path} #{tmp_latest.path})
-      metadata['meta'].merge!(params['title'] => {'timestamp' => Time.now.utc.iso8601})
+    # merge two version with diff.
+    # TODO the merge command is ADDING differences, but it should MERGE differences.
+    def merge_versions(content_one, content_two)
+      tmp_local = Tempfile.open {|f| f.write content_one; f}
+      tmp_latest = Tempfile.open {|f| f.write content_two; f}
+
+      diff_cmd = "diff #{tmp_local.path} #{tmp_latest.path}"
+      system("#{diff_cmd}")
+
+      # raise error until the above TODO is solved
+      raise WikiMergeError, "Please merge with latest version and try again"
+
+      merge_cmd = "diff --line-format %L #{tmp_local.path} #{tmp_latest.path}"
+      @body_text = %x(#{merge_cmd})
     rescue => e
-      puts "WikiMergeError in #{__FILE__}"
+      puts "#{e.class} in #{__FILE__}", e.message
       exit
     end
 
+    def update_metadata
+      metadata['meta'].merge!(params['title'] => {'timestamp' => Time.now.utc.iso8601})
+      File.write(Wikian.meta_file, YAML.dump(metadata))
+    end
+
     def upload_article
       @query = URI.encode_www_form(params)
       puts("\nUploading the wiki article using csrf token #{csrf_token}") if debug
@@ -182,6 +196,7 @@ class Wikian
              "Try pasing the '-r' option to remove '#{csrf_cookie_file}'",
              "Or pass '-d' option for debugging"
       else
+        update_metadata
         puts "Article uploaded"
       end
     end

data/lib/wikian/search.rb

@@ -14,7 +14,7 @@ class Wikian
 
       @api_url = URI("https://#{config['meta']['site']}/w/api.php?#{query}")
     rescue => e
-      puts "#{e.class} in #{__FILE__}. #{e.message}"
+      puts "#{e.class} in #{__FILE__}", e.message
       exit
     end
 

data/lib/wikian/subcommand.rb

@@ -65,7 +65,7 @@ class Wikian
 
       write_response
     rescue => e
-      puts "#{e.class} in #{__FILE__}. #{e.message}"
+      puts "#{e.class} in #{__FILE__}", e.message
       exit
     end
 

data/lib/wikian/version.rb

@@ -1,3 +1,3 @@
 class Wikian
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikian
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - sergioro