visage-app 0.1.0 → 0.1.5

data/README.md

@@ -70,31 +70,25 @@ with the `c['rrddir']` key.
 Deploying
 ---------
 
-With Passenger, create an Apache vhost with the `DocumentRoot` set to the
-`public/` directory of where you have deployed the checked out code, e.g.
+Visage can attempt to generate an Apache vhost config for use with Passenger:
 
+    $ visage genapache
     <VirtualHost *>
-      ServerName visage.example.org
-      ServerAdmin contact@visage.example.org
+      ServerName ubuntu.localdomain
+      ServerAdmin root@ubuntu.localdomain
 
-      DocumentRoot /srv/www/visage.example.org/root/public/
+      DocumentRoot /home/user/.gem/ruby/1.8/gems/visage-app-0.1.0/lib/visage-app/public
 
-      <Directory "/srv/www/visage.example.org/root/public/">
+      <Directory "/home/user/.gem/ruby/1.8/gems/visage-app-0.1.0/lib/visage-app/public">
          Options FollowSymLinks Indexes
          AllowOverride None
          Order allow,deny
          Allow from all
        </Directory>
 
-       ErrorLog /srv/www/visage.example.org/log/apache_errors_log
-       CustomLog /srv/www/visage.example.org/log/apache_app_log combined
-
     </VirtualHost>
 
-This assumes you have a checkout of the code at `/srv/www/visage.example.org/root`.
-
-If you don't want to use Apache + Passenger, you can install the `thin` or
-`mongrel` gems and run up a web server yourself.
+Copypasta this into your system's Apache config structure and tune to taste.
 
 Ubuntu users looking for Passenger packages should add John Ferlito's
 [mod-passenger PPA](https://launchpad.net/~johnf-inodes/+archive/mod-passenger)

data/Rakefile

@@ -19,7 +19,7 @@ begin
     gemspec.summary = "a web (interface | service) for viewing collectd statistics"
     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."
     gemspec.email = "lindsay@holmwood.id.au"
-    gemspec.homepage = "http://github.com/auxesis/visage"
+    gemspec.homepage = "http://auxesis.github.com/visage"
     gemspec.authors = ["Lindsay Holmwood"]
 
     gemspec.add_dependency "sinatra", "1.0"

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.5

data/bin/visage

@@ -9,9 +9,30 @@ case action
 when "start"
   require 'rubygems'
   require 'rack'
-  config = @root.join('config.ru').to_s
+  config = @root.join('lib/visage/config.ru').to_s
   Rack::Server.start(:config => config, :Port => 9292)
+when "genapache"
+  require 'socket'
+  fqdn = Socket.gethostbyname(Socket.gethostname).first
+  public_dir = @root.join('lib/visage-app/public')
+
+  puts <<-CONFIG
+<VirtualHost *>
+  ServerName #{fqdn}
+  ServerAdmin root@#{fqdn}
+
+  DocumentRoot #{public_dir}
+
+  <Directory "#{public_dir}">
+     Options FollowSymLinks Indexes
+     AllowOverride None
+     Order allow,deny
+     Allow from all
+   </Directory>
+
+</VirtualHost>
+  CONFIG
 else
-  puts "Usage: visage start"
+  puts "Usage: visage <start|genapache>"
 end
 

data/features/support/env.rb

@@ -3,7 +3,7 @@
 require 'pathname'
 
 @root = Pathname.new(File.dirname(__FILE__)).parent.parent.expand_path
-app_file = @root.join('lib/visage')
+app_file = @root.join('lib/visage-app')
 
 require 'rubygems'
 require 'spec/expectations'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: visage-app
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -14,54 +19,73 @@ default_executable: visage
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: tilt
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 13
         version: 3.0.13
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: errand
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 2
         version: 0.7.2
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 6
         version: 0.7.6
-    version: 
+  type: :runtime
+  version_requirements: *id005
 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.
 email: lindsay@holmwood.id.au
 executables: 
@@ -76,7 +100,6 @@ files:
 - Rakefile
 - VERSION
 - bin/visage
-- config.ru
 - features/json.feature
 - features/site.feature
 - features/step_definitions/form_steps.rb
@@ -91,6 +114,7 @@ files:
 - lib/visage/collectd/json.rb
 - lib/visage/collectd/profile.rb
 - lib/visage/config.rb
+- lib/visage/config.ru
 - lib/visage/config/fallback-colors.yaml
 - lib/visage/config/init.rb
 - lib/visage/config/plugin-colors.yaml
@@ -111,7 +135,7 @@ files:
 - lib/visage/views/layout.haml
 - lib/visage/views/single.haml
 has_rdoc: true
-homepage: http://github.com/auxesis/visage
+homepage: http://auxesis.github.com/visage
 licenses: []
 
 post_install_message: 
@@ -123,18 +147,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: a web (interface | service) for viewing collectd statistics