rscript 0.1.27 → 0.2.0

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: fab236c9a86767d5708a8a2a94f89c4ec3fa1244
4
- data.tar.gz: da8f6234d734a9020aabcdd6ffdeb2659ec9df16
3
+ metadata.gz: f201f0d5a1f573fd47ec5cc8f8cd2908fb99624f
4
+ data.tar.gz: 5eb6ac706c9bb08669ba68f12486fc92615fbc2f
5
5
  SHA512:
6
- metadata.gz: 790095e5b47342c7c15ef6648ca8701405fe4e40e04d1515aee581bfc86471ec858dbc6b6a38e4a3f52884ec19b86b1e31c317b479f14f367133a30273b240a6
7
- data.tar.gz: 2b2dffe7ecf14306dc01112025faa3c81524d8776d9d1b228ad346eeabfa92c156dc8c52ed8ca80450b4d2310004d6b0eda6db37ffc8377a22b4a6e987a235d6
6
+ metadata.gz: d5a07a761a98030e6d7de2348d1b1f5cb86bad17202a658a727c497175bb6e0766a6775078856b332080d299635a20839b14441d8a6c39f66112bf9c2ceaa5bf
7
+ data.tar.gz: 8f53bdcf076ea7a5149be05bfa2bd1124523667a79fa003190e3898f8e56ba14a3601739172ea2131790f9df70a8188811b66c0f58b5fcc285d7575cc585468b
checksums.yaml.gz.sig CHANGED
Binary file
data.tar.gz.sig CHANGED
Binary file
data/lib/rscript.rb CHANGED
@@ -2,11 +2,13 @@
2
2
 
3
3
  # file: rscript.rb
4
4
 
5
+
5
6
  # created: 1-Jul-2009
6
- # updated: 06-Nov-2013
7
+ # updated: 29-Jan-2015
7
8
 
8
9
  # modification:
9
10
 
11
+ # 29-Jan-2015: Replaced REXML with Rexle
10
12
  # 06-Nov-2013: An error is now raised if the job doesn't exist
11
13
  # 02-Nov-2013: Replaced XThreads with a simle thread
12
14
  # 01-Nov-2013: XThreads now handles the execution of eval statements;
@@ -32,6 +34,7 @@
32
34
 
33
35
  require 'rscript_base'
34
36
  require 'hashcache'
37
+ require 'rexle'
35
38
 
36
39
 
37
40
  class RScript < RScriptBase
@@ -55,16 +58,16 @@ class RScript < RScriptBase
55
58
  args.compact!
56
59
 
57
60
  out = read_rsf(args) do |doc|
58
- doc.root.elements.to_a("//job[#{ajob.join(' or ')}]").map do |job|
59
- job.elements.to_a('script').map {|s| read_script(s)}.join("\n")
60
- end.join("\n")
61
+ doc.root.xpath("//job[#{ajob.join(' or ')}]").map do |job|
62
+ job.xpath('script').map {|s| read_script(s)}.join("\n")
63
+ end.join("\n")
61
64
  end
62
65
 
63
66
  raise "job not found" unless out.length > 0
64
67
  out
65
68
 
66
69
  else
67
- out = read_rsf(args) {|doc| doc.root.elements.to_a('//script').map {|s| read_script(s)}}
70
+ out = read_rsf(args) {|doc| doc.root.xpath('//script').map {|s| read_script(s)}}
68
71
  end
69
72
 
70
73
  [out, args]
@@ -122,7 +125,7 @@ class RScript < RScriptBase
122
125
  buffer = @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
123
126
  #jr080813 buffer = read_sourcecode(rsfile)
124
127
 
125
- doc = Document.new(buffer)
128
+ doc = Rexle.new(buffer)
126
129
  yield(doc)
127
130
 
128
131
  end
@@ -133,9 +136,10 @@ class RScript < RScriptBase
133
136
 
134
137
  $rsfile = rsfile[/[^\/]+(?=\.rsf)/]
135
138
  buffer = @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
136
- #jr080813 buffer = read_sourcecode(rsfile)
139
+
137
140
  @url_base = rsfile[/\w+:\/\/[^\/]+/]
138
- doc = Document.new(buffer)
141
+
142
+ doc = Rexle.new(buffer)
139
143
  yield(doc)
140
144
 
141
145
  end
@@ -147,4 +151,4 @@ if __FILE__ == $0 then
147
151
  rs = RScript.new()
148
152
  code, args = rs.read(raw_args)
149
153
  puts eval(code).join("\n")
150
- end
154
+ end
data/lib/rscript_base.rb CHANGED
@@ -1,32 +1,32 @@
1
1
  #!/usr/bin/env ruby
2
- #file: rscript_base.rb
2
+
3
+ # file: rscript_base.rb
3
4
 
4
5
  require 'cgi'
5
6
  require 'open-uri'
6
7
  require 'rxfhelper'
7
- require 'rexml/document'
8
- #include REXML
9
8
 
10
9
  class RScriptBase
11
- include REXML
12
10
 
13
11
  def initialize()
14
12
  end
15
13
 
16
14
  def read(doc)
17
- doc.root.elements.to_a('//script').map {|s| run_script(s)}.join(';')
15
+ doc.root.xpath('//script').map {|s| run_script(s)}.join(';')
18
16
  end
19
17
 
20
18
  protected
21
19
 
22
20
  def read_script(script)
23
21
  out_buffer = ''
24
- src = script.attribute('src')
22
+
23
+ src = script.attributes[:src]
25
24
 
26
25
  if src then
27
- out_buffer = read_sourcecode(script.attribute('src').value.to_s)
26
+
27
+ out_buffer = read_sourcecode(script.attributes[:src].value.to_s)
28
28
  else
29
- code = script.text.to_s.strip.length > 0 ? script.text : script.cdatas.join.strip
29
+ code = script.text.strip.length > 0 ? script.text : script.cdatas.join.strip
30
30
  out_buffer = code
31
31
  end
32
32
  out_buffer
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rscript
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.27
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
31
31
  pTl90ccAo96Myith2+5jI2p1BAoSjDRNTv+Uz21Zp7x1b0lFfXtaZ4FK5hu/B+DM
32
32
  B4M/dUmu40qQLg==
33
33
  -----END CERTIFICATE-----
34
- date: 2014-07-14 00:00:00.000000000 Z
34
+ date: 2015-01-29 00:00:00.000000000 Z
35
35
  dependencies:
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: hashcache
@@ -73,6 +73,26 @@ dependencies:
73
73
  - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: 0.1.12
76
+ - !ruby/object:Gem::Dependency
77
+ name: rexle
78
+ requirement: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - "~>"
81
+ - !ruby/object:Gem::Version
82
+ version: '1.1'
83
+ - - ">="
84
+ - !ruby/object:Gem::Version
85
+ version: 1.1.4
86
+ type: :runtime
87
+ prerelease: false
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ requirements:
90
+ - - "~>"
91
+ - !ruby/object:Gem::Version
92
+ version: '1.1'
93
+ - - ">="
94
+ - !ruby/object:Gem::Version
95
+ version: 1.1.4
76
96
  description:
77
97
  email: james@r0bertson.co.uk
78
98
  executables: []
@@ -107,4 +127,3 @@ specification_version: 4
107
127
  summary: rscript previously known as rcscript, reads Ruby code which is embedded within
108
128
  an rscript XML file.
109
129
  test_files: []
110
- has_rdoc:
metadata.gz.sig CHANGED
Binary file