smartermeter 0.3.3 → 0.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (22) hide show
  1. data/CHANGELOG.md +6 -0
  2. data/README.md +16 -16
  3. data/Rakefile +9 -14
  4. data/lib/smartermeter/daemon.rb +9 -10
  5. data/lib/smartermeter/interfaces/swing.rb +35 -30
  6. data/lib/smartermeter/samples.rb +21 -25
  7. data/lib/smartermeter/service.rb +49 -66
  8. data/lib/smartermeter/services/pachube.erb +2 -0
  9. data/lib/smartermeter/services/{google_powermeter.rb → pachube.rb} +10 -10
  10. data/lib/smartermeter.rb +2 -2
  11. data/smartermeter.gemspec +8 -16
  12. metadata +147 -154
  13. data/lib/smartermeter/services/google_powermeter.erb +0 -16
  14. data/spec/fixtures/data.csv +0 -21
  15. data/spec/fixtures/expected_google_request.xml +0 -292
  16. data/spec/fixtures/vcr_cassettes/brighterplanet.yml +0 -106
  17. data/spec/sample_spec.rb +0 -8
  18. data/spec/samples_spec.rb +0 -39
  19. data/spec/service_spec.rb +0 -7
  20. data/spec/services/brighterplanet_spec.rb +0 -26
  21. data/spec/services/google_powermeter_spec.rb +0 -19
  22. data/spec/spec_helper.rb +0 -15
metadata CHANGED
@@ -1,176 +1,169 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: smartermeter
3
- version: !ruby/object:Gem::Version
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.4.0
4
5
  prerelease:
5
- version: 0.3.3
6
6
  platform: ruby
7
- authors:
8
- - Matt Colyer
7
+ authors:
8
+ - Matt Colyer
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
-
13
- date: 2011-04-21 00:00:00 -07:00
14
- default_executable: smartermeter
15
- dependencies:
16
- - !ruby/object:Gem::Dependency
17
- name: mechanize
18
- prerelease: false
19
- requirement: &id001 !ruby/object:Gem::Requirement
20
- none: false
21
- requirements:
22
- - - "="
23
- - !ruby/object:Gem::Version
24
- version: 1.0.0
25
- type: :runtime
26
- version_requirements: *id001
27
- - !ruby/object:Gem::Dependency
28
- name: crypt19
29
- prerelease: false
30
- requirement: &id002 !ruby/object:Gem::Requirement
31
- none: false
32
- requirements:
33
- - - "="
34
- - !ruby/object:Gem::Version
35
- version: 1.2.1
36
- type: :runtime
37
- version_requirements: *id002
38
- - !ruby/object:Gem::Dependency
39
- name: rest-client
40
- prerelease: false
41
- requirement: &id003 !ruby/object:Gem::Requirement
42
- none: false
43
- requirements:
44
- - - "="
45
- - !ruby/object:Gem::Version
46
- version: 1.6.1
47
- type: :runtime
48
- version_requirements: *id003
49
- - !ruby/object:Gem::Dependency
50
- name: json_pure
51
- prerelease: false
52
- requirement: &id004 !ruby/object:Gem::Requirement
53
- none: false
54
- requirements:
55
- - - "="
56
- - !ruby/object:Gem::Version
57
- version: 1.5.1
58
- type: :runtime
59
- version_requirements: *id004
60
- - !ruby/object:Gem::Dependency
61
- name: rspec
62
- prerelease: false
63
- requirement: &id005 !ruby/object:Gem::Requirement
64
- none: false
65
- requirements:
66
- - - ~>
67
- - !ruby/object:Gem::Version
68
- version: 2.5.0
69
- type: :development
70
- version_requirements: *id005
71
- - !ruby/object:Gem::Dependency
72
- name: vcr
73
- prerelease: false
74
- requirement: &id006 !ruby/object:Gem::Requirement
75
- none: false
76
- requirements:
77
- - - ~>
78
- - !ruby/object:Gem::Version
79
- version: 1.7.0
80
- type: :development
81
- version_requirements: *id006
82
- - !ruby/object:Gem::Dependency
83
- name: webmock
84
- prerelease: false
85
- requirement: &id007 !ruby/object:Gem::Requirement
86
- none: false
87
- requirements:
88
- - - ~>
89
- - !ruby/object:Gem::Version
90
- version: 1.6.2
91
- type: :development
92
- version_requirements: *id007
93
- - !ruby/object:Gem::Dependency
94
- name: minitar
95
- prerelease: false
96
- requirement: &id008 !ruby/object:Gem::Requirement
97
- none: false
98
- requirements:
99
- - - ~>
100
- - !ruby/object:Gem::Version
101
- version: 0.5.2
102
- type: :development
103
- version_requirements: *id008
12
+ date: 2012-01-28 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
15
+ name: mechanize
16
+ requirement: &70260787107760 !ruby/object:Gem::Requirement
17
+ none: false
18
+ requirements:
19
+ - - =
20
+ - !ruby/object:Gem::Version
21
+ version: 1.0.0
22
+ type: :runtime
23
+ prerelease: false
24
+ version_requirements: *70260787107760
25
+ - !ruby/object:Gem::Dependency
26
+ name: crypt19
27
+ requirement: &70260787105640 !ruby/object:Gem::Requirement
28
+ none: false
29
+ requirements:
30
+ - - =
31
+ - !ruby/object:Gem::Version
32
+ version: 1.2.1
33
+ type: :runtime
34
+ prerelease: false
35
+ version_requirements: *70260787105640
36
+ - !ruby/object:Gem::Dependency
37
+ name: rest-client
38
+ requirement: &70260787101360 !ruby/object:Gem::Requirement
39
+ none: false
40
+ requirements:
41
+ - - =
42
+ - !ruby/object:Gem::Version
43
+ version: 1.6.1
44
+ type: :runtime
45
+ prerelease: false
46
+ version_requirements: *70260787101360
47
+ - !ruby/object:Gem::Dependency
48
+ name: json_pure
49
+ requirement: &70260787100160 !ruby/object:Gem::Requirement
50
+ none: false
51
+ requirements:
52
+ - - =
53
+ - !ruby/object:Gem::Version
54
+ version: 1.5.1
55
+ type: :runtime
56
+ prerelease: false
57
+ version_requirements: *70260787100160
58
+ - !ruby/object:Gem::Dependency
59
+ name: rubyzip
60
+ requirement: &70260787141160 !ruby/object:Gem::Requirement
61
+ none: false
62
+ requirements:
63
+ - - =
64
+ - !ruby/object:Gem::Version
65
+ version: 0.9.5
66
+ type: :runtime
67
+ prerelease: false
68
+ version_requirements: *70260787141160
69
+ - !ruby/object:Gem::Dependency
70
+ name: rspec
71
+ requirement: &70260787136680 !ruby/object:Gem::Requirement
72
+ none: false
73
+ requirements:
74
+ - - ~>
75
+ - !ruby/object:Gem::Version
76
+ version: 2.8.0
77
+ type: :development
78
+ prerelease: false
79
+ version_requirements: *70260787136680
80
+ - !ruby/object:Gem::Dependency
81
+ name: vcr
82
+ requirement: &70260787160520 !ruby/object:Gem::Requirement
83
+ none: false
84
+ requirements:
85
+ - - ~>
86
+ - !ruby/object:Gem::Version
87
+ version: 1.11.3
88
+ type: :development
89
+ prerelease: false
90
+ version_requirements: *70260787160520
91
+ - !ruby/object:Gem::Dependency
92
+ name: webmock
93
+ requirement: &70260787157720 !ruby/object:Gem::Requirement
94
+ none: false
95
+ requirements:
96
+ - - ~>
97
+ - !ruby/object:Gem::Version
98
+ version: 1.7.10
99
+ type: :development
100
+ prerelease: false
101
+ version_requirements: *70260787157720
102
+ - !ruby/object:Gem::Dependency
103
+ name: minitar
104
+ requirement: &70260787156440 !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ~>
108
+ - !ruby/object:Gem::Version
109
+ version: 0.5.2
110
+ type: :development
111
+ prerelease: false
112
+ version_requirements: *70260787156440
104
113
  description: Fetches SmartMeter data from PG&E and can upload to Google PowerMeter
105
114
  email: matt.removethis@nospam.colyer.name
106
- executables:
107
- - smartermeter
115
+ executables:
116
+ - smartermeter
108
117
  extensions: []
109
-
110
118
  extra_rdoc_files: []
111
-
112
- files:
113
- - CHANGELOG.md
114
- - Gemfile
115
- - LICENSE
116
- - README.md
117
- - Rakefile
118
- - bin/smartermeter
119
- - icons/smartermeter-16x16.png
120
- - icons/smartermeter-32x32.png
121
- - icons/smartermeter.ico
122
- - icons/smartermeter.svg
123
- - installer/launch4j.xml
124
- - installer/main.rb
125
- - installer/nsis.nsi
126
- - lib/smartermeter.rb
127
- - lib/smartermeter/daemon.rb
128
- - lib/smartermeter/interfaces/cli.rb
129
- - lib/smartermeter/interfaces/swing.rb
130
- - lib/smartermeter/sample.rb
131
- - lib/smartermeter/samples.rb
132
- - lib/smartermeter/service.rb
133
- - lib/smartermeter/services/brighterplanet.rb
134
- - lib/smartermeter/services/cacert.pem
135
- - lib/smartermeter/services/google_powermeter.erb
136
- - lib/smartermeter/services/google_powermeter.rb
137
- - smartermeter.gemspec
138
- - spec/fixtures/data.csv
139
- - spec/fixtures/expected_google_request.xml
140
- - spec/fixtures/vcr_cassettes/brighterplanet.yml
141
- - spec/sample_spec.rb
142
- - spec/samples_spec.rb
143
- - spec/service_spec.rb
144
- - spec/services/brighterplanet_spec.rb
145
- - spec/services/google_powermeter_spec.rb
146
- - spec/spec_helper.rb
147
- has_rdoc: true
119
+ files:
120
+ - CHANGELOG.md
121
+ - Gemfile
122
+ - LICENSE
123
+ - README.md
124
+ - Rakefile
125
+ - bin/smartermeter
126
+ - icons/smartermeter-16x16.png
127
+ - icons/smartermeter-32x32.png
128
+ - icons/smartermeter.ico
129
+ - icons/smartermeter.svg
130
+ - installer/launch4j.xml
131
+ - installer/main.rb
132
+ - installer/nsis.nsi
133
+ - lib/smartermeter.rb
134
+ - lib/smartermeter/daemon.rb
135
+ - lib/smartermeter/interfaces/cli.rb
136
+ - lib/smartermeter/interfaces/swing.rb
137
+ - lib/smartermeter/sample.rb
138
+ - lib/smartermeter/samples.rb
139
+ - lib/smartermeter/service.rb
140
+ - lib/smartermeter/services/brighterplanet.rb
141
+ - lib/smartermeter/services/cacert.pem
142
+ - lib/smartermeter/services/pachube.erb
143
+ - lib/smartermeter/services/pachube.rb
144
+ - smartermeter.gemspec
148
145
  homepage: http://github.com/mcolyer/smartermeter
149
146
  licenses: []
150
-
151
147
  post_install_message:
152
148
  rdoc_options: []
153
-
154
- require_paths:
155
- - lib
156
- required_ruby_version: !ruby/object:Gem::Requirement
149
+ require_paths:
150
+ - lib
151
+ required_ruby_version: !ruby/object:Gem::Requirement
157
152
  none: false
158
- requirements:
159
- - - ">="
160
- - !ruby/object:Gem::Version
161
- version: "0"
162
- required_rubygems_version: !ruby/object:Gem::Requirement
153
+ requirements:
154
+ - - ! '>='
155
+ - !ruby/object:Gem::Version
156
+ version: '0'
157
+ required_rubygems_version: !ruby/object:Gem::Requirement
163
158
  none: false
164
- requirements:
165
- - - ">="
166
- - !ruby/object:Gem::Version
167
- version: "0"
159
+ requirements:
160
+ - - ! '>='
161
+ - !ruby/object:Gem::Version
162
+ version: '0'
168
163
  requirements: []
169
-
170
164
  rubyforge_project: smartermeter
171
- rubygems_version: 1.5.1
165
+ rubygems_version: 1.8.11
172
166
  signing_key:
173
167
  specification_version: 2
174
168
  summary: Fetches SmartMeter data from PG&E
175
169
  test_files: []
176
-
data/lib/smartermeter/services/google_powermeter.erb DELETED
@@ -1,16 +0,0 @@
1
- <?xml version="1.0"?>
2
- <feed xmlns="http://www.w3.org/2005/Atom" xmlns:meter="http://schemas.google.com/meter/2008">
3
- <% samples.each do |sample| %>
4
- <entry xmlns="http://www.w3.org/2005/Atom" xmlns:meter="http://schemas.google.com/meter/2008">
5
- <id>https://www.google.com/powermeter/feeds<%= @config[:variable] %>/durMeasurement/<%= sample.utc_start_time.gsub(":", "_") %></id>
6
- <category scheme="http://schemas.google.com/g/2005#kind"
7
- term="http://schemas.google.com/meter/2008#durMeasurement"/>
8
- <meter:subject>https://www.google.com/powermeter/feeds<%= @config[:variable] %></meter:subject>
9
- <meter:startTime meter:uncertainty="1.000000"><%= sample.utc_start_time %></meter:startTime>
10
- <meter:endTime meter:uncertainty="1.000000"><%= sample.utc_stop_time %></meter:endTime>
11
- <meter:quantity meter:uncertainty="0.001000" meter:unit="kW h">
12
- <%= sample.kwh %>
13
- </meter:quantity>
14
- </entry>
15
- <% end %>
16
- </feed>
data/spec/fixtures/data.csv DELETED
@@ -1,21 +0,0 @@
1
- "Name","DOE,JOHN "
2
- "Address","1 MARKET ST, SAN FRANCSICO, CA 94110"
3
- "Account Number",="12345678"
4
- "Disclaimer","The information contained in this file is intended for the personal and confidential use of the recipient(s) named above. Any unauthorized use is prohibited."
5
-
6
- "Title","Hourly Usage"
7
- "Meter Number","Electric - 12345678"
8
- "Selected Date","10/01/2009"
9
- "Selected Period","Week"
10
- "Primary Data Unit","kWh"
11
- "Secondary Data Unit","-"
12
-
13
- "","12:00 AM","1:00 AM","2:00 AM","3:00 AM","4:00 AM","5:00 AM","6:00 AM","7:00 AM","8:00 AM","9:00 AM","10:00 AM","11:00 AM","12:00 PM","1:00 PM","2:00 PM","3:00 PM","4:00 PM","5:00 PM","6:00 PM","7:00 PM","8:00 PM","9:00 PM","10:00 PM","11:00 PM"
14
- "9/27/2009","-",".205",".257",".131",".142",".136",".127",".137",".136",".134",".416","1.732","1.844",".190",".189",".182",".173","1.136","3.550","3.011","1.426",".508",".580",".316"
15
- "9/28/2009",".142",".165",".140",".148",".157",".138",".140",".607",".709",".183",".131",".134",".144",".143",".135",".214",".179",".161",".165",".661",".461",".390",".467",".239"
16
- "9/29/2009",".271",".124",".127",".122",".133",".131",".121",".149",".723",".409",".388",".317",".341",".335",".338",".341",".310",".298",".316","1.561",".601",".463",".494",".471"
17
- "9/30/2009",".536",".224",".136",".131",".133",".128",".128",".104",".518",".706",".385",".320",".338",".373",".227",".097",".088",".097",".093",".099",".100",".090",".095",".092"
18
- "10/01/2009",".097",".096",".094",".095",".082",".086",".094",".089",".080",".093",".074",".094",".087",".081",".096",".089",".080",".170",".143",".106",".096",".091",".099",".097"
19
- "10/02/2009",".098",".095",".089",".083",".094",".095",".080",".088",".095",".073",".095",".094",".075",".094",".096",".075",".095",".097",".096",".098",".098",".096",".097",".086"
20
- "10/03/2009",".093",".088",".097",".097",".094",".096",".092",".079",".094",".094",".095",".131",".151",".098",".083",".092",".097",".098",".092",".080",".095",".097",".097",".074"
21
-