sisu 7.1.0 → 7.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/bin/sisu +12 -9
  3. data/bin/sisugem +12 -9
  4. data/data/sisu/version.yml +3 -3
  5. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ec1967070776c6a1ed4417c8ce4873bfcfe5721e
4
- data.tar.gz: be2dcbe200bdad9a10d6177f2226bb81d9c622af
3
+ metadata.gz: 2e05b4f93d945b72c01c5167124c33c7adc68fc1
4
+ data.tar.gz: 96a44eddf786c3f5777760f5e142f5ed4d7516d3
5
5
  SHA512:
6
- metadata.gz: e8a3d8f61a14b83d02c2cf7c45dfd9631f0c50a167c746462a2ba401e961810bca5d6a1e19d2f42b7973f88cae114ee68e2f6a2d78f4af41a15840ccbc826482
7
- data.tar.gz: d24d3987935d8b6f0d4cf26576c21abaf8d94e0ff94a572888eeac200e9cd80478669c65637543ec20583a81537c2e0174ec2a019cb8316dade4151bf1120a65
6
+ metadata.gz: d53cae5f0563981d5c908cf8474499d750d33ac60d864553d9cf7ab7d4a763d74358791308b99d4be40a5719303d2f94efe68bc517f74d5bf2d726356e25b308
7
+ data.tar.gz: 4c16223d8ecdc78f86bbb5e23114b5b5abc5bbcc5c1cd8ee21369b84568a22e4a0a64339e636f660119f66c94abc72011f7850a9073adc3533d688104fde3209
data/bin/sisu CHANGED
@@ -20,7 +20,7 @@ class Orient
20
20
  :full_path_to_sisu_bin_in_sisu_dir_tree
21
21
  elsif processing.sisu_runtime_path =~/\/gems\// \
22
22
  and processing.sisu_runtime_path \
23
- =~ /\/sisu-(?:\d+|[a-z])\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//
23
+ =~ /\/#{processing.gem_regex}\//
24
24
  :gem_install
25
25
  else
26
26
  :system_install
@@ -43,7 +43,7 @@ class Orient
43
43
  %r{\bsisu$}
44
44
  end
45
45
  def gem_regex
46
- %r{\/sisu-(?:\d+|[a-z])\.(?:\d+|[a-z])\.(?:\d+|[a-z])\/}
46
+ %r{sisu-[0-9]+\.[0-9]+\.[0-9]+(?:\.r[0-9]+\.g[0-9a-f]{7})?}
47
47
  end
48
48
  self
49
49
  end
@@ -109,17 +109,20 @@ class Orient
109
109
  File.expand_path(processing.called_as).
110
110
  sub(/\/bin\/sisu$/,'/data/sisu')
111
111
  when :set_path_gem
112
- Gem::Specification.find_by_name("sisu").gem_dir + '/data/sisu'
112
+ Gem::Specification.find_by_name("sisu").gem_dir \
113
+ + '/data/sisu'
113
114
  else nil
114
115
  end
115
116
  end
116
117
  def sisu_this_lib
117
- if processing.sisu_runtime_path =~/\/gems\// \
118
+ if not Gem::Specification.find_by_name("sisu").nil? \
119
+ and processing.sisu_runtime_path =~/\/gems\// \
118
120
  and processing.sisu_runtime_path \
119
- =~ /\/sisu-(?:\d+|[a-z])\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//
121
+ =~ /\/#{processing.gem_regex}\//
120
122
  # gem sought
121
123
  processing.sisu_runtime_path.
122
- gsub(/\/bin\/sisu[a-z0-7_-]*$/,'/lib/sisu')
124
+ gsub(/\/bin\/sisu[a-z0-9._-]*$/,
125
+ '/lib/sisu')
123
126
  elsif (processing.called_as \
124
127
  !~ /^#{RbConfig::CONFIG['bindir']}\/sisu$/)
125
128
  # called off file system, project directory tree
@@ -128,12 +131,12 @@ class Orient
128
131
  else
129
132
  # distro installation
130
133
  sisulib={
131
- vendorlib: RbConfig::CONFIG['vendordir'] + '/sisu',
134
+ vendorlib: RbConfig::CONFIG['vendorlibdir'] + '/sisu',
132
135
  sitelib: RbConfig::CONFIG['sitelibdir'] + '/sisu',
133
136
  }
134
- if FileTest.directory?(sisulib[:sitelib]) # Arch Linux; Debian local
137
+ if FileTest.directory?(sisulib[:sitelib]) # local install
135
138
  sisulib[:sitelib]
136
- elsif FileTest.directory?(sisulib[:vendorlib]) # Debian GNU Linux system
139
+ elsif FileTest.directory?(sisulib[:vendorlib]) # system install
137
140
  sisulib[:vendorlib]
138
141
  else 'sisu' # assume lib paths work
139
142
  end
data/bin/sisugem CHANGED
@@ -20,7 +20,7 @@ class Orient
20
20
  :full_path_to_sisu_bin_in_sisu_dir_tree
21
21
  elsif processing.sisu_runtime_path =~/\/gems\// \
22
22
  and processing.sisu_runtime_path \
23
- =~ /\/sisu-(?:\d+|[a-z])\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//
23
+ =~ /\/#{processing.gem_regex}\//
24
24
  :gem_install
25
25
  else
26
26
  :system_install
@@ -43,7 +43,7 @@ class Orient
43
43
  %r{\bsisu$}
44
44
  end
45
45
  def gem_regex
46
- %r{\/sisu-(?:\d+|[a-z])\.(?:\d+|[a-z])\.(?:\d+|[a-z])\/}
46
+ %r{sisu-[0-9]+\.[0-9]+\.[0-9]+(?:\.r[0-9]+\.g[0-9a-f]{7})?}
47
47
  end
48
48
  self
49
49
  end
@@ -109,17 +109,20 @@ class Orient
109
109
  File.expand_path(processing.called_as).
110
110
  sub(/\/bin\/sisu$/,'/data/sisu')
111
111
  when :set_path_gem
112
- Gem::Specification.find_by_name("sisu").gem_dir + '/data/sisu'
112
+ Gem::Specification.find_by_name("sisu").gem_dir \
113
+ + '/data/sisu'
113
114
  else nil
114
115
  end
115
116
  end
116
117
  def sisu_this_lib
117
- if processing.sisu_runtime_path =~/\/gems\// \
118
+ if not Gem::Specification.find_by_name("sisu").nil? \
119
+ and processing.sisu_runtime_path =~/\/gems\// \
118
120
  and processing.sisu_runtime_path \
119
- =~ /\/sisu-(?:\d+|[a-z])\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//
121
+ =~ /\/#{processing.gem_regex}\//
120
122
  # gem sought
121
123
  processing.sisu_runtime_path.
122
- gsub(/\/bin\/sisu[a-z0-7_-]*$/,'/lib/sisu')
124
+ gsub(/\/bin\/sisu[a-z0-9._-]*$/,
125
+ '/lib/sisu')
123
126
  elsif (processing.called_as \
124
127
  !~ /^#{RbConfig::CONFIG['bindir']}\/sisu$/)
125
128
  # called off file system, project directory tree
@@ -128,12 +131,12 @@ class Orient
128
131
  else
129
132
  # distro installation
130
133
  sisulib={
131
- vendorlib: RbConfig::CONFIG['vendordir'] + '/sisu',
134
+ vendorlib: RbConfig::CONFIG['vendorlibdir'] + '/sisu',
132
135
  sitelib: RbConfig::CONFIG['sitelibdir'] + '/sisu',
133
136
  }
134
- if FileTest.directory?(sisulib[:sitelib]) # Arch Linux; Debian local
137
+ if FileTest.directory?(sisulib[:sitelib]) # local install
135
138
  sisulib[:sitelib]
136
- elsif FileTest.directory?(sisulib[:vendorlib]) # Debian GNU Linux system
139
+ elsif FileTest.directory?(sisulib[:vendorlib]) # system install
137
140
  sisulib[:vendorlib]
138
141
  else 'sisu' # assume lib paths work
139
142
  end
data/data/sisu/version.yml CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
2
  :project: SiSU
3
- :version: 7.1.0
4
- :date_stamp: 2015w19/5
5
- :date: "2015-05-15"
3
+ :version: 7.1.1
4
+ :date_stamp: 2015w19/7
5
+ :date: "2015-05-17"
metadata CHANGED
@@ -1,17 +1,17 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sisu
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.1.0
4
+ version: 7.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ralph Amissah
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-15 00:00:00.000000000 Z
11
+ date: 2015-05-17 00:00:00.000000000 Z
12
12
  dependencies: []
13
- description: documents - structuring, publishing in multiple formats & search [7.1.0]
14
- (linux calls & without external dependencies)
13
+ description: documents - structuring, publishing in multiple formats & search [7.1.1
14
+ from git 7.1.1.r0.g4748a2e] (linux calls & without external dependencies)
15
15
  email: ralph.amissah@gmail.com
16
16
  executables:
17
17
  - sisugem