data_miner 0.4.34 → 0.4.35

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/Rakefile +2 -1
  2. data/VERSION +1 -1
  3. data/data_miner.gemspec +8 -5
  4. data/lib/data_miner.rb +4 -3
  5. data/lib/data_miner/tap.rb +10 -1
  6. metadata +37 -23
data/Rakefile CHANGED
@@ -10,7 +10,8 @@ begin
10
10
  gem.email = "seamus@abshere.net"
11
11
  gem.homepage = "http://github.com/seamusabshere/data_miner"
12
12
  gem.authors = ["Seamus Abshere", "Andy Rossmeissl"]
13
- gem.add_dependency 'remote_table', '>=0.2.23'
13
+ gem.add_dependency 'remote_table', '>=0.2.24'
14
+ gem.add_dependency 'escape', '>=0.0.4'
14
15
  gem.add_dependency 'activerecord', '>=2.3.4'
15
16
  gem.add_dependency 'activesupport', '>=2.3.4'
16
17
  gem.add_dependency 'andand', '>=1.3.1'
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.34
1
+ 0.4.35
data/data_miner.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{data_miner}
8
- s.version = "0.4.34"
8
+ s.version = "0.4.35"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Seamus Abshere", "Andy Rossmeissl"]
12
- s.date = %q{2010-05-21}
12
+ s.date = %q{2010-05-24}
13
13
  s.description = %q{Mine remote data into your ActiveRecord models. You can also perform associations and convert units.}
14
14
  s.email = %q{seamus@abshere.net}
15
15
  s.extra_rdoc_files = [
@@ -53,7 +53,8 @@ Gem::Specification.new do |s|
53
53
  s.specification_version = 3
54
54
 
55
55
  if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
56
- s.add_runtime_dependency(%q<remote_table>, [">= 0.2.23"])
56
+ s.add_runtime_dependency(%q<remote_table>, [">= 0.2.24"])
57
+ s.add_runtime_dependency(%q<escape>, [">= 0.0.4"])
57
58
  s.add_runtime_dependency(%q<activerecord>, [">= 2.3.4"])
58
59
  s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
59
60
  s.add_runtime_dependency(%q<andand>, [">= 1.3.1"])
@@ -64,7 +65,8 @@ Gem::Specification.new do |s|
64
65
  s.add_runtime_dependency(%q<taps>, [">= 0.3.5"])
65
66
  s.add_development_dependency(%q<loose_tight_dictionary>, [">= 0.0.5"])
66
67
  else
67
- s.add_dependency(%q<remote_table>, [">= 0.2.23"])
68
+ s.add_dependency(%q<remote_table>, [">= 0.2.24"])
69
+ s.add_dependency(%q<escape>, [">= 0.0.4"])
68
70
  s.add_dependency(%q<activerecord>, [">= 2.3.4"])
69
71
  s.add_dependency(%q<activesupport>, [">= 2.3.4"])
70
72
  s.add_dependency(%q<andand>, [">= 1.3.1"])
@@ -76,7 +78,8 @@ Gem::Specification.new do |s|
76
78
  s.add_dependency(%q<loose_tight_dictionary>, [">= 0.0.5"])
77
79
  end
78
80
  else
79
- s.add_dependency(%q<remote_table>, [">= 0.2.23"])
81
+ s.add_dependency(%q<remote_table>, [">= 0.2.24"])
82
+ s.add_dependency(%q<escape>, [">= 0.0.4"])
80
83
  s.add_dependency(%q<activerecord>, [">= 2.3.4"])
81
84
  s.add_dependency(%q<activesupport>, [">= 2.3.4"])
82
85
  s.add_dependency(%q<andand>, [">= 1.3.1"])
data/lib/data_miner.rb CHANGED
@@ -13,6 +13,7 @@ require 'blockenspiel'
13
13
  require 'conversions'
14
14
  require 'errata'
15
15
  require 'remote_table'
16
+ require 'escape'
16
17
  require 'andand'
17
18
  require 'log4r'
18
19
  require 'fileutils'
@@ -76,10 +77,10 @@ module DataMiner
76
77
  end
77
78
 
78
79
  # TODO this should probably live somewhere else
79
- def self.backtick_with_reporting(cmd, raise_on_error = true)
80
- cmd = cmd.gsub /\s+/m, ' '
80
+ def self.backtick_with_reporting(cmd)
81
+ cmd = cmd.gsub /[ ]*\n[ ]*/m, ' '
81
82
  output = `#{cmd}`
82
- if raise_on_error and not $?.success?
83
+ if not $?.success?
83
84
  raise %{
84
85
  From the data_miner gem...
85
86
 
data/lib/data_miner/tap.rb CHANGED
@@ -104,7 +104,16 @@ module DataMiner
104
104
 
105
105
  # taps pull mysql://root:password@localhost/taps_test http://foo:bar@data.brighterplanet.com:5000 --tables aircraft
106
106
  def taps_pull_cmd
107
- "taps pull #{adapter}://#{db_locator} #{source} --indexes-first --tables #{source_table_name}"
107
+ Escape.shell_command [
108
+ 'taps',
109
+ 'pull',
110
+ "#{adapter}://#{db_locator}",
111
+ source,
112
+ '--indexes-first',
113
+ '--tables',
114
+ source_table_name
115
+ ]
116
+ # "taps pull #{source} --indexes-first --tables #{source_table_name}"
108
117
  end
109
118
 
110
119
  # 2.3.5 mysql
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 4
8
- - 34
9
- version: 0.4.34
8
+ - 35
9
+ version: 0.4.35
10
10
  platform: ruby
11
11
  authors:
12
12
  - Seamus Abshere
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-05-21 00:00:00 -04:00
18
+ date: 2010-05-24 00:00:00 -04:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -28,14 +28,28 @@ dependencies:
28
28
  segments:
29
29
  - 0
30
30
  - 2
31
- - 23
32
- version: 0.2.23
31
+ - 24
32
+ version: 0.2.24
33
33
  type: :runtime
34
34
  version_requirements: *id001
35
35
  - !ruby/object:Gem::Dependency
36
- name: activerecord
36
+ name: escape
37
37
  prerelease: false
38
38
  requirement: &id002 !ruby/object:Gem::Requirement
39
+ requirements:
40
+ - - ">="
41
+ - !ruby/object:Gem::Version
42
+ segments:
43
+ - 0
44
+ - 0
45
+ - 4
46
+ version: 0.0.4
47
+ type: :runtime
48
+ version_requirements: *id002
49
+ - !ruby/object:Gem::Dependency
50
+ name: activerecord
51
+ prerelease: false
52
+ requirement: &id003 !ruby/object:Gem::Requirement
39
53
  requirements:
40
54
  - - ">="
41
55
  - !ruby/object:Gem::Version
@@ -45,11 +59,11 @@ dependencies:
45
59
  - 4
46
60
  version: 2.3.4
47
61
  type: :runtime
48
- version_requirements: *id002
62
+ version_requirements: *id003
49
63
  - !ruby/object:Gem::Dependency
50
64
  name: activesupport
51
65
  prerelease: false
52
- requirement: &id003 !ruby/object:Gem::Requirement
66
+ requirement: &id004 !ruby/object:Gem::Requirement
53
67
  requirements:
54
68
  - - ">="
55
69
  - !ruby/object:Gem::Version
@@ -59,11 +73,11 @@ dependencies:
59
73
  - 4
60
74
  version: 2.3.4
61
75
  type: :runtime
62
- version_requirements: *id003
76
+ version_requirements: *id004
63
77
  - !ruby/object:Gem::Dependency
64
78
  name: andand
65
79
  prerelease: false
66
- requirement: &id004 !ruby/object:Gem::Requirement
80
+ requirement: &id005 !ruby/object:Gem::Requirement
67
81
  requirements:
68
82
  - - ">="
69
83
  - !ruby/object:Gem::Version
@@ -73,11 +87,11 @@ dependencies:
73
87
  - 1
74
88
  version: 1.3.1
75
89
  type: :runtime
76
- version_requirements: *id004
90
+ version_requirements: *id005
77
91
  - !ruby/object:Gem::Dependency
78
92
  name: conversions
79
93
  prerelease: false
80
- requirement: &id005 !ruby/object:Gem::Requirement
94
+ requirement: &id006 !ruby/object:Gem::Requirement
81
95
  requirements:
82
96
  - - ">="
83
97
  - !ruby/object:Gem::Version
@@ -87,11 +101,11 @@ dependencies:
87
101
  - 4
88
102
  version: 1.4.4
89
103
  type: :runtime
90
- version_requirements: *id005
104
+ version_requirements: *id006
91
105
  - !ruby/object:Gem::Dependency
92
106
  name: blockenspiel
93
107
  prerelease: false
94
- requirement: &id006 !ruby/object:Gem::Requirement
108
+ requirement: &id007 !ruby/object:Gem::Requirement
95
109
  requirements:
96
110
  - - ">="
97
111
  - !ruby/object:Gem::Version
@@ -101,11 +115,11 @@ dependencies:
101
115
  - 2
102
116
  version: 0.3.2
103
117
  type: :runtime
104
- version_requirements: *id006
118
+ version_requirements: *id007
105
119
  - !ruby/object:Gem::Dependency
106
120
  name: log4r
107
121
  prerelease: false
108
- requirement: &id007 !ruby/object:Gem::Requirement
122
+ requirement: &id008 !ruby/object:Gem::Requirement
109
123
  requirements:
110
124
  - - ">="
111
125
  - !ruby/object:Gem::Version
@@ -115,11 +129,11 @@ dependencies:
115
129
  - 7
116
130
  version: 1.1.7
117
131
  type: :runtime
118
- version_requirements: *id007
132
+ version_requirements: *id008
119
133
  - !ruby/object:Gem::Dependency
120
134
  name: errata
121
135
  prerelease: false
122
- requirement: &id008 !ruby/object:Gem::Requirement
136
+ requirement: &id009 !ruby/object:Gem::Requirement
123
137
  requirements:
124
138
  - - ">="
125
139
  - !ruby/object:Gem::Version
@@ -129,11 +143,11 @@ dependencies:
129
143
  - 1
130
144
  version: 0.2.1
131
145
  type: :runtime
132
- version_requirements: *id008
146
+ version_requirements: *id009
133
147
  - !ruby/object:Gem::Dependency
134
148
  name: taps
135
149
  prerelease: false
136
- requirement: &id009 !ruby/object:Gem::Requirement
150
+ requirement: &id010 !ruby/object:Gem::Requirement
137
151
  requirements:
138
152
  - - ">="
139
153
  - !ruby/object:Gem::Version
@@ -143,11 +157,11 @@ dependencies:
143
157
  - 5
144
158
  version: 0.3.5
145
159
  type: :runtime
146
- version_requirements: *id009
160
+ version_requirements: *id010
147
161
  - !ruby/object:Gem::Dependency
148
162
  name: loose_tight_dictionary
149
163
  prerelease: false
150
- requirement: &id010 !ruby/object:Gem::Requirement
164
+ requirement: &id011 !ruby/object:Gem::Requirement
151
165
  requirements:
152
166
  - - ">="
153
167
  - !ruby/object:Gem::Version
@@ -157,7 +171,7 @@ dependencies:
157
171
  - 5
158
172
  version: 0.0.5
159
173
  type: :development
160
- version_requirements: *id010
174
+ version_requirements: *id011
161
175
  description: Mine remote data into your ActiveRecord models. You can also perform associations and convert units.
162
176
  email: seamus@abshere.net
163
177
  executables: []