extend_script 0.3.0 → 0.3.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d888e149501f85911619327c6389366f1c60de35
4
- data.tar.gz: e3ba3b6da4f4cb88e476c4d0de56f58cba9b1f79
3
+ metadata.gz: e93fbc8f2e032a2280e50da16b68df6315796313
4
+ data.tar.gz: 9fc439d07ce1eb99c4370eafc5afa32e0b14f097
5
5
  SHA512:
6
- metadata.gz: c93b3d57a6e5eff7f3fc004c6efd773c2986e949f83ceef320352d320dbd51fc47fc09cea5cd5ba72c8a3a038df524e59ca9dab04efa35e61d9ae7d54ad524eb
7
- data.tar.gz: 3f3d5a0a99e0a0b21a90ff2e43b90440fd9dc9591d9473208ace9a6d627caa050327161feb85ee659e402bb4484db5e92ad0291674fc610507a90fd6d20ee553
6
+ metadata.gz: 98d79bf059b04ed66b8aa6583ef9f4705324bd218aee6a80c67f1993f964e90af5cdef46a9546e97239cd9201c8ceb1b86bbd0fa2af8aefdfc741a79c31be175
7
+ data.tar.gz: de43359e1c8126eab6708afbc86e716a323fb49b28975dc7a095600f7ed44175279479afc14daea2f760995e48a9759ee0eb8d41a5f9351dc0e81c47bf5e613f
data/README.md CHANGED
@@ -27,8 +27,8 @@ Or install it yourself as:
27
27
 
28
28
  ## Usage
29
29
 
30
- $ extendscript merge --input main.jsx [--output merged.jsx --embed-version 1.2.3]
31
- $ extendscript merge -i main.jsx [-o merged.jsx -e 1.2.3]
30
+ $ extendscript merge --input main.jsx [--output merged.jsx --embed-version 1.2.3 --detach-target --attach #target\ 'photoshop-70']
31
+ $ extendscript merge -i main.jsx [-o merged.jsx -e 1.2.3 -d -a #target\ 'photoshop-70']
32
32
 
33
33
  ## Development
34
34
 
@@ -12,7 +12,7 @@ module ExtendScript
12
12
  end
13
13
 
14
14
 
15
- desc "merge usage", "extendscript merge -i infile [-o outfile]"
15
+ desc "merge", "Merge extendscript.jsx files"
16
16
  method_option "input", aliases: "i", required: true
17
17
  method_option "output", aliases: "o", required: false
18
18
  method_option "embed-version", aliases: "e", required: false
@@ -30,6 +30,8 @@ module ExtendScript
30
30
  detach_target: detach_target,
31
31
  attach_target: attach_target
32
32
  }
33
+ raise unless File.exist?(infile)
34
+
33
35
  export(infile, outfile, opts)
34
36
  end
35
37
 
@@ -66,15 +68,16 @@ module ExtendScript
66
68
  end
67
69
 
68
70
  def remove_target(lines)
69
- reg = /(^#|^\/\/@)target\s+[\'\"](.+)[\'\"]/
71
+ reg = /(^#|^\/\/@)target\s+[\'\"]?(.+)[\'\"]?/
70
72
  lines.reject { |line| line =~ reg }
71
73
  end
72
74
 
73
75
  def merge_recursive(infile, results=[], dup={})
74
- File.open(infile, "r") do |file|
76
+
77
+ File.open(infile.chomp, "r") do |file|
75
78
  file.readlines.each do |line|
76
79
  # search #include or //@include
77
- reg = /(^#|^\/\/@)include\s+[\'\"](.+)[\'\"]/
80
+ reg = /(^#|^\/\/@)include\s+[\'\"]?([^\'\"]+)/
78
81
  if line =~ reg
79
82
  m2 = line.match(reg)[2]
80
83
  child_path = File.expand_path(m2, File.dirname(infile))
@@ -1,3 +1,3 @@
1
1
  module ExtendScript
2
- VERSION = "0.3.0"
2
+ VERSION = "0.3.2"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: extend_script
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - milligramme
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-04-05 00:00:00.000000000 Z
11
+ date: 2017-04-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
107
107
  version: '0'
108
108
  requirements: []
109
109
  rubyforge_project:
110
- rubygems_version: 2.6.8
110
+ rubygems_version: 2.6.11
111
111
  signing_key:
112
112
  specification_version: 4
113
113
  summary: adobe jsx utility.