konjac 0.2.6.1 → 0.2.6.2

data/lib/applescripts/konjac_word_export

@@ -51,7 +51,7 @@ to extract(filename)
 
     -- iterate through paragraphs
     set paragraph_index to 1
-    set current_paragraph to paragraph 1 in active document
+    set current_paragraph to paragraph 1 in active_document
 
     -- save old delimiters
     

data/lib/konjac/cli.rb

@@ -76,6 +76,8 @@ eos
               opt :from, I18n.t(:from, :scope => :opts), :type => :string
               opt :to, I18n.t(:to, :scope => :opts), :type => :string
               opt :output, I18n.t(:output, :scope => :opts), :type => :string
+              opt :force, I18n.t(:force, :scope => :opts), :default => false,
+                :short => :y
               opt :using, I18n.t(:using, :scope => :opts), :type => :string,
                 :default => "dict", :multi => true
               opt :help, I18n.t(:help, :scope => :opts)

data/lib/konjac/version.rb

@@ -1,4 +1,4 @@
 module Konjac
   # The current version number of Konjac
-  VERSION = "0.2.6.1"
+  VERSION = "0.2.6.2"
 end

data/lib/konjac/word.rb

@@ -18,7 +18,7 @@ module Konjac
             orig_docx = "#{dirname}/#{basename}.docx"
             new_path  = "#{dirname}/#{basename}_imported.docx"
             xml_path  = "#{dirname}/#{basename}.xml"
-            tags_path = "#{dirname}/#{basename}.diff"
+            tags_path = "#{dirname}/#{basename}.docx.diff"
             out_path  = "#{dirname}/word/document.xml"
 
             # Open the original XML file and the updated tags
@@ -71,6 +71,8 @@ module Konjac
         sub_files.each do |sub_file|
           case File.extname(sub_file)
           when ".doc"
+            break unless Utils.user_allows_overwrite?(sub_file + ".diff")
+
             system File.join(File.dirname(__FILE__), "..", "applescripts", "konjac_word_export"), sub_file
           when ".docx"
             # Build a list of all the paths we're working with
@@ -79,7 +81,9 @@ module Konjac
             orig_docx  = "#{dirname}/#{basename}.docx"
             xml_path   = "#{dirname}/#{basename}_orig.xml"
             clean_path = "#{dirname}/#{basename}.xml"
-            tags_path  = "#{dirname}/#{basename}.diff"
+            tags_path  = "#{dirname}/#{basename}.docx.diff"
+
+            break unless Utils.user_allows_overwrite?(tags_path)
 
             # Unzip the DOCX's word/document.xml file and pipe the output into
             # an XML with the same base name as the DOCX

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.2.6.1
+  version: 0.2.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amatch
-  requirement: &70100942990900 !ruby/object:Gem::Requirement
+  requirement: &70108546610540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100942990900
+  version_requirements: *70108546610540
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70100942990280 !ruby/object:Gem::Requirement
+  requirement: &70108546610120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100942990280
+  version_requirements: *70108546610120
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70100942989860 !ruby/object:Gem::Requirement
+  requirement: &70108546609700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100942989860
+  version_requirements: *70108546609700
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70100942989440 !ruby/object:Gem::Requirement
+  requirement: &70108546609260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100942989440
+  version_requirements: *70108546609260
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70100942989000 !ruby/object:Gem::Requirement
+  requirement: &70108546608820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100942989000
+  version_requirements: *70108546608820
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70100942988560 !ruby/object:Gem::Requirement
+  requirement: &70108546635980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100942988560
+  version_requirements: *70108546635980
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70100943008840 !ruby/object:Gem::Requirement
+  requirement: &70108546635480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100943008840
+  version_requirements: *70108546635480
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70100943008320 !ruby/object:Gem::Requirement
+  requirement: &70108546634940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100943008320
+  version_requirements: *70108546634940
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70100943007620 !ruby/object:Gem::Requirement
+  requirement: &70108546633520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100943007620
+  version_requirements: *70108546633520
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70100943006400 !ruby/object:Gem::Requirement
+  requirement: &70108546633060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100943006400
+  version_requirements: *70108546633060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70100943005980 !ruby/object:Gem::Requirement
+  requirement: &70108546632640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100943005980
+  version_requirements: *70108546632640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70100943005520 !ruby/object:Gem::Requirement
+  requirement: &70108546632080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100943005520
+  version_requirements: *70108546632080
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com