visage-app 0.3.2 → 0.3.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (39) hide show
  1. data/.gitignore +1 -1
  2. data/README.md +5 -5
  3. data/Rakefile +6 -6
  4. data/VERSION +1 -1
  5. data/bin/{visage → visage-app} +2 -2
  6. data/features/cli.feature +3 -3
  7. data/lib/visage-app.rb +9 -9
  8. data/lib/{visage → visage-app}/collectd/json.rb +1 -1
  9. data/lib/{visage → visage-app}/collectd/profile.rb +0 -0
  10. data/lib/{visage → visage-app}/collectd/rrds.rb +1 -1
  11. data/lib/{visage → visage-app}/config.rb +0 -0
  12. data/lib/{visage → visage-app}/config.ru +0 -0
  13. data/lib/{visage → visage-app}/config/fallback-colors.yaml +0 -0
  14. data/lib/{visage/config/init.rb → visage-app/config/file.rb} +1 -1
  15. data/lib/{visage → visage-app}/config/plugin-colors.yaml +0 -0
  16. data/lib/{visage → visage-app}/graph.rb +0 -0
  17. data/lib/{visage → visage-app}/helpers.rb +0 -0
  18. data/lib/{visage → visage-app}/patches.rb +0 -0
  19. data/lib/{visage → visage-app}/profile.rb +2 -2
  20. data/lib/{visage → visage-app}/public/favicon.gif +0 -0
  21. data/lib/{visage → visage-app}/public/images/add.png +0 -0
  22. data/lib/{visage → visage-app}/public/images/hosts.png +0 -0
  23. data/lib/{visage → visage-app}/public/images/metrics.png +0 -0
  24. data/lib/{visage → visage-app}/public/images/search.png +0 -0
  25. data/lib/{visage → visage-app}/public/javascripts/g.line-min.js +0 -0
  26. data/lib/{visage → visage-app}/public/javascripts/g.line.js +0 -0
  27. data/lib/{visage → visage-app}/public/javascripts/g.raphael-min.js +0 -0
  28. data/lib/{visage → visage-app}/public/javascripts/g.raphael.js +0 -0
  29. data/lib/{visage → visage-app}/public/javascripts/graph.js +0 -0
  30. data/lib/{visage → visage-app}/public/javascripts/mootools-1.2.3-core.js +0 -0
  31. data/lib/{visage → visage-app}/public/javascripts/mootools-1.2.3.1-more.js +0 -0
  32. data/lib/{visage → visage-app}/public/javascripts/raphael-min.js +0 -0
  33. data/lib/{visage → visage-app}/public/javascripts/raphael.js +0 -0
  34. data/lib/{visage → visage-app}/public/stylesheets/screen.css +0 -0
  35. data/lib/{visage → visage-app}/views/builder.haml +0 -0
  36. data/lib/{visage → visage-app}/views/layout.haml +0 -0
  37. data/lib/{visage → visage-app}/views/profile.haml +0 -0
  38. data/lib/{visage → visage-app}/views/profiles.haml +0 -0
  39. metadata +37 -37
data/.gitignore CHANGED
@@ -6,6 +6,6 @@ pkg/*
6
6
  .#*
7
7
  webrat*
8
8
  visage-app.gemspec
9
- lib/visage/config/profiles.yaml
9
+ lib/visage-app/config/profiles.yaml
10
10
  _site
11
11
  features/data/config/*/*.yaml
data/README.md CHANGED
@@ -44,14 +44,14 @@ Running
44
44
 
45
45
  You can try out Visage quickly with:
46
46
 
47
- $ visage start
47
+ $ visage-app start
48
48
 
49
49
  Then paste the URL from the output into your browser.
50
50
 
51
51
  If you get a `command not found` when running the above command (RubyGems likely
52
52
  isn't on your PATH), try this instead:
53
53
 
54
- $ $(dirname $(dirname $(gem which visage-app)))/bin/visage start
54
+ $ $(dirname $(dirname $(gem which visage-app)))/bin/visage-app start
55
55
 
56
56
  Deploying
57
57
  ---------
@@ -62,7 +62,7 @@ Visage can be deployed on Apache with Passenger:
62
62
 
63
63
  Visage can attempt to generate an Apache vhost config for use with Passenger:
64
64
 
65
- $ visage genapache
65
+ $ visage-app genapache
66
66
  <VirtualHost *>
67
67
  ServerName ubuntu.localdomain
68
68
  ServerAdmin root@ubuntu.localdomain
@@ -82,7 +82,7 @@ Copypasta this into your system's Apache config structure and tune to taste.
82
82
  To do this on Debian/Ubuntu:
83
83
 
84
84
  $ sudo -s
85
- $ visage genapache > /etc/apache2/sites-enabled/visage
85
+ $ visage-app genapache > /etc/apache2/sites-enabled/visage
86
86
  $ a2dissite default
87
87
  $ service apache2 reload
88
88
 
@@ -102,7 +102,7 @@ You can set the `CONFIG_PATH` environment variable to add another directory to
102
102
  the config load path. This directory will be searched when loading up
103
103
  configuration files.
104
104
 
105
- CONFIG_PATH=/var/lib/visage visage
105
+ CONFIG_PATH=/var/lib/visage-app start
106
106
 
107
107
  This is especially useful when you want to deploy + run Visage from an installed
108
108
  gem with Passenger. e.g.
data/Rakefile CHANGED
@@ -15,12 +15,12 @@ end
15
15
  begin
16
16
  require 'jeweler'
17
17
  Jeweler::Tasks.new do |gemspec|
18
- gemspec.name = "visage-app"
19
- gemspec.summary = "a web (interface | service) for viewing collectd statistics"
18
+ gemspec.name = "visage-app"
19
+ gemspec.summary = "a web (interface | service) for viewing collectd statistics"
20
20
  gemspec.description = "Visage is a web interface for viewing collectd statistics. It also provides a JSON interface onto collectd's RRD data, giving you an easy way to mash up the data."
21
- gemspec.email = "lindsay@holmwood.id.au"
22
- gemspec.homepage = "http://auxesis.github.com/visage"
23
- gemspec.authors = ["Lindsay Holmwood"]
21
+ gemspec.email = "lindsay@holmwood.id.au"
22
+ gemspec.homepage = "http://visage-app.com/"
23
+ gemspec.authors = ["Lindsay Holmwood"]
24
24
 
25
25
  gemspec.add_dependency "sinatra", "1.0"
26
26
  gemspec.add_dependency "tilt", "1.0.1"
@@ -50,7 +50,7 @@ desc "perform lintian checks on the JavaScript about to be shipped"
50
50
  task :lintian do
51
51
  require 'pathname'
52
52
  @root = Pathname.new(File.dirname(__FILE__)).expand_path
53
- javascripts_path = @root.join('lib/visage/public/javascripts')
53
+ javascripts_path = @root.join('lib/visage-app/public/javascripts')
54
54
 
55
55
  count = `grep -c 'console.log' #{javascripts_path.join('graph.js')}`.strip.to_i
56
56
  abort("#{count} instances of console.log found in graph.js!") if count > 0
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.3.2
1
+ 0.3.3
@@ -27,13 +27,13 @@ when "start"
27
27
  puts "Looking for RRDs in #{Visage::Config.rrddir}"
28
28
  puts
29
29
 
30
- config = @root.join('lib/visage/config.ru').to_s
30
+ config = @root.join('lib/visage-app/config.ru').to_s
31
31
  server = Rack::Server.new(:config => config, :Port => port, :server => "webrick")
32
32
  server.start
33
33
  when "genapache"
34
34
  require 'socket'
35
35
  fqdn = Socket.gethostbyname(Socket.gethostname).first
36
- public_dir = @root.join('lib/visage/public')
36
+ public_dir = @root.join('lib/visage-app/public')
37
37
 
38
38
  puts <<-CONFIG
39
39
  <VirtualHost *>
data/features/cli.feature CHANGED
@@ -6,18 +6,18 @@ Feature: command line utility
6
6
 
7
7
  Scenario: Command line tool
8
8
  Given the "visage" gem is installed
9
- When I start the visage server helper with "visage start"
9
+ When I start the visage server helper with "visage-app start"
10
10
  Then a visage web server should be running
11
11
 
12
12
  Scenario: Seeing where Visage is getting its data from
13
13
  Given the "visage" gem is installed
14
- When I start the visage server helper with "visage start"
14
+ When I start the visage server helper with "visage-app start"
15
15
  Then I should see "Looking for RRDs in /.*collectd" on the terminal
16
16
 
17
17
  Scenario: Specified configuration directory
18
18
  Given the "visage" gem is installed
19
19
  And there is no file at "features/data/config/with_no_profiles/profiles.yaml"
20
- When I start the visage server helper with "visage start" and the following variables:
20
+ When I start the visage server helper with "visage-app start" and the following variables:
21
21
  | CONFIG_PATH |
22
22
  | features/data/config/with_no_profiles |
23
23
  Then I should see a file at "features/data/config/with_no_profiles/profiles.yaml"
data/lib/visage-app.rb CHANGED
@@ -6,19 +6,19 @@ $: << @root.to_s
6
6
 
7
7
  require 'sinatra/base'
8
8
  require 'haml'
9
- require 'lib/visage/profile'
10
- require 'lib/visage/config'
11
- require 'lib/visage/helpers'
12
- require 'lib/visage/config/init'
13
- require 'lib/visage/collectd/rrds'
14
- require 'lib/visage/collectd/json'
9
+ require 'lib/visage-app/profile'
10
+ require 'lib/visage-app/helpers'
11
+ require 'lib/visage-app/config'
12
+ require 'lib/visage-app/config/file'
13
+ require 'lib/visage-app/collectd/rrds'
14
+ require 'lib/visage-app/collectd/json'
15
15
  require 'yajl/json_gem'
16
16
 
17
17
  module Visage
18
18
  class Application < Sinatra::Base
19
19
  @root = Pathname.new(File.dirname(__FILE__)).parent.expand_path
20
- set :public, @root.join('lib/visage/public')
21
- set :views, @root.join('lib/visage/views')
20
+ set :public, @root.join('lib/visage-app/public')
21
+ set :views, @root.join('lib/visage-app/views')
22
22
 
23
23
  helpers Sinatra::LinkToHelper
24
24
  helpers Sinatra::PageTitleHelper
@@ -79,7 +79,7 @@ module Visage
79
79
  get '/javascripts/visage.js' do
80
80
  javascript = ""
81
81
  %w{raphael-min g.raphael g.line mootools-1.2.3-core mootools-1.2.3.1-more graph}.each do |js|
82
- javascript += File.read(@root.join('lib/visage/public/javascripts', "#{js}.js"))
82
+ javascript += File.read(@root.join('lib/visage-app/public/javascripts', "#{js}.js"))
83
83
  end
84
84
  javascript
85
85
  end
@@ -2,7 +2,7 @@
2
2
 
3
3
  @root = Pathname.new(File.dirname(__FILE__)).parent.parent.parent.expand_path
4
4
  $: << @root.to_s
5
- require 'lib/visage/patches'
5
+ require 'lib/visage-app/patches'
6
6
  require 'errand'
7
7
  require 'yajl'
8
8
 
File without changes
@@ -2,7 +2,7 @@
2
2
 
3
3
  $: << File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..'))
4
4
 
5
- require 'lib/visage/patches'
5
+ require 'lib/visage-app/patches'
6
6
 
7
7
  module Visage
8
8
  module Collectd
File without changes
File without changes
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env ruby
2
2
 
3
3
  @root = Pathname.new(File.dirname(__FILE__)).parent.parent.parent.expand_path
4
- require @root.join('lib/visage/config')
4
+ require @root.join('lib/visage-app/config')
5
5
  require 'yaml'
6
6
 
7
7
  module Visage
File without changes
File without changes
File without changes
@@ -2,8 +2,8 @@
2
2
 
3
3
  root = Pathname.new(File.dirname(__FILE__)).parent.parent
4
4
  $: << root.join('lib')
5
- require 'lib/visage/graph'
6
- require 'lib/visage/patches'
5
+ require 'lib/visage-app/graph'
6
+ require 'lib/visage-app/patches'
7
7
  require 'digest/md5'
8
8
 
9
9
  module Visage
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 3
8
- - 2
9
- version: 0.3.2
8
+ - 3
9
+ version: 0.3.3
10
10
  platform: ruby
11
11
  authors:
12
12
  - Lindsay Holmwood
@@ -15,7 +15,7 @@ bindir: bin
15
15
  cert_chain: []
16
16
 
17
17
  date: 2010-10-18 00:00:00 +11:00
18
- default_executable: visage
18
+ default_executable: visage-app
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: sinatra
@@ -89,7 +89,7 @@ dependencies:
89
89
  description: Visage is a web interface for viewing collectd statistics. It also provides a JSON interface onto collectd's RRD data, giving you an easy way to mash up the data.
90
90
  email: lindsay@holmwood.id.au
91
91
  executables:
92
- - visage
92
+ - visage-app
93
93
  extensions: []
94
94
 
95
95
  extra_rdoc_files:
@@ -100,7 +100,7 @@ files:
100
100
  - README.md
101
101
  - Rakefile
102
102
  - VERSION
103
- - bin/visage
103
+ - bin/visage-app
104
104
  - features/builder.feature
105
105
  - features/cli.feature
106
106
  - features/data/config/with_no_profiles/.stub
@@ -114,41 +114,41 @@ files:
114
114
  - features/step_definitions/webrat_steps.rb
115
115
  - features/support/env.rb
116
116
  - lib/visage-app.rb
117
- - lib/visage/collectd/json.rb
118
- - lib/visage/collectd/profile.rb
119
- - lib/visage/collectd/rrds.rb
120
- - lib/visage/config.rb
121
- - lib/visage/config.ru
122
- - lib/visage/config/fallback-colors.yaml
123
- - lib/visage/config/init.rb
124
- - lib/visage/config/plugin-colors.yaml
125
- - lib/visage/graph.rb
126
- - lib/visage/helpers.rb
127
- - lib/visage/patches.rb
128
- - lib/visage/profile.rb
129
- - lib/visage/public/favicon.gif
130
- - lib/visage/public/images/add.png
131
- - lib/visage/public/images/hosts.png
132
- - lib/visage/public/images/metrics.png
133
- - lib/visage/public/images/search.png
134
- - lib/visage/public/javascripts/g.line-min.js
135
- - lib/visage/public/javascripts/g.line.js
136
- - lib/visage/public/javascripts/g.raphael-min.js
137
- - lib/visage/public/javascripts/g.raphael.js
138
- - lib/visage/public/javascripts/graph.js
139
- - lib/visage/public/javascripts/mootools-1.2.3-core.js
140
- - lib/visage/public/javascripts/mootools-1.2.3.1-more.js
141
- - lib/visage/public/javascripts/raphael-min.js
142
- - lib/visage/public/javascripts/raphael.js
143
- - lib/visage/public/stylesheets/screen.css
144
- - lib/visage/views/builder.haml
145
- - lib/visage/views/layout.haml
146
- - lib/visage/views/profile.haml
147
- - lib/visage/views/profiles.haml
117
+ - lib/visage-app/collectd/json.rb
118
+ - lib/visage-app/collectd/profile.rb
119
+ - lib/visage-app/collectd/rrds.rb
120
+ - lib/visage-app/config.rb
121
+ - lib/visage-app/config.ru
122
+ - lib/visage-app/config/fallback-colors.yaml
123
+ - lib/visage-app/config/file.rb
124
+ - lib/visage-app/config/plugin-colors.yaml
125
+ - lib/visage-app/graph.rb
126
+ - lib/visage-app/helpers.rb
127
+ - lib/visage-app/patches.rb
128
+ - lib/visage-app/profile.rb
129
+ - lib/visage-app/public/favicon.gif
130
+ - lib/visage-app/public/images/add.png
131
+ - lib/visage-app/public/images/hosts.png
132
+ - lib/visage-app/public/images/metrics.png
133
+ - lib/visage-app/public/images/search.png
134
+ - lib/visage-app/public/javascripts/g.line-min.js
135
+ - lib/visage-app/public/javascripts/g.line.js
136
+ - lib/visage-app/public/javascripts/g.raphael-min.js
137
+ - lib/visage-app/public/javascripts/g.raphael.js
138
+ - lib/visage-app/public/javascripts/graph.js
139
+ - lib/visage-app/public/javascripts/mootools-1.2.3-core.js
140
+ - lib/visage-app/public/javascripts/mootools-1.2.3.1-more.js
141
+ - lib/visage-app/public/javascripts/raphael-min.js
142
+ - lib/visage-app/public/javascripts/raphael.js
143
+ - lib/visage-app/public/stylesheets/screen.css
144
+ - lib/visage-app/views/builder.haml
145
+ - lib/visage-app/views/layout.haml
146
+ - lib/visage-app/views/profile.haml
147
+ - lib/visage-app/views/profiles.haml
148
148
  - man/visage-app.5
149
149
  - man/visage-app.5.ronn
150
150
  has_rdoc: true
151
- homepage: http://auxesis.github.com/visage
151
+ homepage: http://visage-app.com/
152
152
  licenses: []
153
153
 
154
154
  post_install_message: