konjac 0.2.6.1 → 0.2.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -51,7 +51,7 @@ to extract(filename)
51
51
 
52
52
  -- iterate through paragraphs
53
53
  set paragraph_index to 1
54
- set current_paragraph to paragraph 1 in active document
54
+ set current_paragraph to paragraph 1 in active_document
55
55
 
56
56
  -- save old delimiters
57
57
 
data/lib/konjac/cli.rb CHANGED
@@ -76,6 +76,8 @@ eos
76
76
  opt :from, I18n.t(:from, :scope => :opts), :type => :string
77
77
  opt :to, I18n.t(:to, :scope => :opts), :type => :string
78
78
  opt :output, I18n.t(:output, :scope => :opts), :type => :string
79
+ opt :force, I18n.t(:force, :scope => :opts), :default => false,
80
+ :short => :y
79
81
  opt :using, I18n.t(:using, :scope => :opts), :type => :string,
80
82
  :default => "dict", :multi => true
81
83
  opt :help, I18n.t(:help, :scope => :opts)
@@ -1,4 +1,4 @@
1
1
  module Konjac
2
2
  # The current version number of Konjac
3
- VERSION = "0.2.6.1"
3
+ VERSION = "0.2.6.2"
4
4
  end
data/lib/konjac/word.rb CHANGED
@@ -18,7 +18,7 @@ module Konjac
18
18
  orig_docx = "#{dirname}/#{basename}.docx"
19
19
  new_path = "#{dirname}/#{basename}_imported.docx"
20
20
  xml_path = "#{dirname}/#{basename}.xml"
21
- tags_path = "#{dirname}/#{basename}.diff"
21
+ tags_path = "#{dirname}/#{basename}.docx.diff"
22
22
  out_path = "#{dirname}/word/document.xml"
23
23
 
24
24
  # Open the original XML file and the updated tags
@@ -71,6 +71,8 @@ module Konjac
71
71
  sub_files.each do |sub_file|
72
72
  case File.extname(sub_file)
73
73
  when ".doc"
74
+ break unless Utils.user_allows_overwrite?(sub_file + ".diff")
75
+
74
76
  system File.join(File.dirname(__FILE__), "..", "applescripts", "konjac_word_export"), sub_file
75
77
  when ".docx"
76
78
  # Build a list of all the paths we're working with
@@ -79,7 +81,9 @@ module Konjac
79
81
  orig_docx = "#{dirname}/#{basename}.docx"
80
82
  xml_path = "#{dirname}/#{basename}_orig.xml"
81
83
  clean_path = "#{dirname}/#{basename}.xml"
82
- tags_path = "#{dirname}/#{basename}.diff"
84
+ tags_path = "#{dirname}/#{basename}.docx.diff"
85
+
86
+ break unless Utils.user_allows_overwrite?(tags_path)
83
87
 
84
88
  # Unzip the DOCX's word/document.xml file and pipe the output into
85
89
  # an XML with the same base name as the DOCX
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: konjac
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.6.1
4
+ version: 0.2.6.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-01-25 00:00:00.000000000 Z
12
+ date: 2012-01-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: amatch
16
- requirement: &70100942990900 !ruby/object:Gem::Requirement
16
+ requirement: &70108546610540 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70100942990900
24
+ version_requirements: *70108546610540
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: highline
27
- requirement: &70100942990280 !ruby/object:Gem::Requirement
27
+ requirement: &70108546610120 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70100942990280
35
+ version_requirements: *70108546610120
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: i18n
38
- requirement: &70100942989860 !ruby/object:Gem::Requirement
38
+ requirement: &70108546609700 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70100942989860
46
+ version_requirements: *70108546609700
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: nokogiri
49
- requirement: &70100942989440 !ruby/object:Gem::Requirement
49
+ requirement: &70108546609260 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70100942989440
57
+ version_requirements: *70108546609260
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: sdoc
60
- requirement: &70100942989000 !ruby/object:Gem::Requirement
60
+ requirement: &70108546608820 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70100942989000
68
+ version_requirements: *70108546608820
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: term-ansicolor
71
- requirement: &70100942988560 !ruby/object:Gem::Requirement
71
+ requirement: &70108546635980 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70100942988560
79
+ version_requirements: *70108546635980
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: trollop
82
- requirement: &70100943008840 !ruby/object:Gem::Requirement
82
+ requirement: &70108546635480 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70100943008840
90
+ version_requirements: *70108546635480
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: autotest
93
- requirement: &70100943008320 !ruby/object:Gem::Requirement
93
+ requirement: &70108546634940 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70100943008320
101
+ version_requirements: *70108546634940
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: autotest-fsevent
104
- requirement: &70100943007620 !ruby/object:Gem::Requirement
104
+ requirement: &70108546633520 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70100943007620
112
+ version_requirements: *70108546633520
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: autotest-growl
115
- requirement: &70100943006400 !ruby/object:Gem::Requirement
115
+ requirement: &70108546633060 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70100943006400
123
+ version_requirements: *70108546633060
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: bundler
126
- requirement: &70100943005980 !ruby/object:Gem::Requirement
126
+ requirement: &70108546632640 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70100943005980
134
+ version_requirements: *70108546632640
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: rspec
137
- requirement: &70100943005520 !ruby/object:Gem::Requirement
137
+ requirement: &70108546632080 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
142
142
  version: '0'
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *70100943005520
145
+ version_requirements: *70108546632080
146
146
  description: A Ruby command-line utility for translating files using a YAML wordlist
147
147
  email:
148
148
  - bryan.mckelvey@gmail.com