whipped-cream 0.0.1pre2 → 0.0.1pre3

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+lib/whipped-cream/public/assets/.sass-cache
+lib/whipped-cream/public/assets/baseline.0.5.3

data/Gemfile

@@ -1,10 +1,9 @@
 source 'https://rubygems.org'
 
-ruby '1.9.3'
-
 gemspec
 
 group :development do
   gem 'guard-cane'
   gem 'guard-rspec'
+  gem 'compass'
 end

data/README.md

@@ -1,4 +1,7 @@
 # whipped-cream
+[![Gem Version](https://badge.fury.io/rb/whipped-cream.png)](http://badge.fury.io/rb/whipped-cream)
+[![Build Status](https://travis-ci.org/justincampbell/whipped-cream.png?branch=master)](https://travis-ci.org/justincampbell/whipped-cream)
+[![Code Climate](https://codeclimate.com/github/justincampbell/whipped-cream.png)](https://codeclimate.com/github/justincampbell/whipped-cream)
 
 ## DSL
 

data/lib/whipped-cream/deployer.rb

@@ -37,9 +37,6 @@ module WhippedCream
         which ruby ||
           time sudo apt-get install ruby -y
 
-        which runit ||
-          time sudo apt-get install runit -y
-
         which whipped-cream ||
           time sudo gem install whipped-cream --no-ri --no-rdoc --pre
 
@@ -58,11 +55,12 @@ module WhippedCream
     def run_plugin
       ssh_exec <<-SCRIPT
         cd ~/whipped-cream
-        sudo whipped-cream start demo.rb
+        sudo whipped-cream start #{plugin_filename} --daemonize
       SCRIPT
     end
 
     def scp_copy(local, remote)
+      puts "Copying #{local} to pi@#{pi_address}:#{remote}"
       scp.upload! local, remote
     end
 

data/lib/whipped-cream/public/assets/config.rb

@@ -0,0 +1,7 @@
+http_path = "/"
+css_dir = "stylesheets"
+sass_dir = "sass"
+images_dir = "images"
+javascripts_dir = "javascripts"
+
+preferred_syntax = :sass

data/lib/whipped-cream/public/assets/sass/_default.sass

@@ -0,0 +1,54 @@
+body
+  background-color: #fff
+  font-family: sans-serif
+  font-size: 16px
+  color: #798795
+
+a
+  text-decoration: none
+
+h1
+  text-align: center
+  color: #fff
+  background-color: #2C3E50
+  top: 0
+  padding: 1em
+  font-size: 1.5em
+  font-weight: 700
+
+hr
+  height: 1px
+
+form
+  text-align: center
+
+input[type="submit"]
+  background-color: #1abc9c
+  width: 90%
+  border: none
+  color: #fff
+  padding: 1em
+  margin-top: 2em
+  font-size: 1em
+  -webkit-appearance: none
+  +border-radius(8px)
+  &:hover, &:active
+    background-color: #16A085
+
+.item
+  +clearfix
+  padding: 1em
+  margin: 0 auto
+  h2
+    +inline-block
+    vertical-align: middle
+    font-size: 1.2em
+    width: 49%
+    font-weight: 700
+    top: 0
+  p
+    +inline-block
+    vertical-align: middle
+    width: 49%
+    text-align: right
+    top: 0

data/lib/whipped-cream/public/assets/sass/_variables.sass

@@ -0,0 +1,28 @@
+//Colors -----
+
+$light-grey: #ededeb
+$middle-grey: #d0d0d0
+$dark-grey: #3B3B3B
+
+$light-turquoise: #1ABC9C
+$dark-turquoise: #16A085
+
+$light-green: #2ECC71
+$dark-green: #27AE60
+
+$extra-light-blue: #3498DB
+$light-blue: #2980B9
+$dark-blue: #34495E
+$extra-dark-blue: #2C3E50
+
+$light-purple: #9B59B6
+$dark-purple: #8E44AD
+
+$yellow: #F1C40F
+$orange: #F39C12
+
+$light-pumpkin: #E67E22
+$dark-pumpkin: #D35400
+
+$light-red: #E74C3C
+$dark-red: #C0392B

data/lib/whipped-cream/public/assets/sass/application.sass

@@ -0,0 +1,7 @@
+@import compass/reset
+@import compass/css3
+@import compass/utilities/general/clearfix
+
+@import variables
+
+@import default

data/lib/whipped-cream/public/assets/stylesheets/application.css

@@ -0,0 +1,154 @@
+/* line 17, ../../../../../../../../.rvm/gems/ruby-1.9.3-p194/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font: inherit;
+  font-size: 100%;
+  vertical-align: baseline;
+}
+
+/* line 22, ../../../../../../../../.rvm/gems/ruby-1.9.3-p194/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+html {
+  line-height: 1;
+}
+
+/* line 24, ../../../../../../../../.rvm/gems/ruby-1.9.3-p194/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+ol, ul {
+  list-style: none;
+}
+
+/* line 26, ../../../../../../../../.rvm/gems/ruby-1.9.3-p194/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+/* line 28, ../../../../../../../../.rvm/gems/ruby-1.9.3-p194/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+caption, th, td {
+  text-align: left;
+  font-weight: normal;
+  vertical-align: middle;
+}
+
+/* line 30, ../../../../../../../../.rvm/gems/ruby-1.9.3-p194/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+q, blockquote {
+  quotes: none;
+}
+/* line 103, ../../../../../../../../.rvm/gems/ruby-1.9.3-p194/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+q:before, q:after, blockquote:before, blockquote:after {
+  content: "";
+  content: none;
+}
+
+/* line 32, ../../../../../../../../.rvm/gems/ruby-1.9.3-p194/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+a img {
+  border: none;
+}
+
+/* line 116, ../../../../../../../../.rvm/gems/ruby-1.9.3-p194/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
+  display: block;
+}
+
+/* line 1, ../sass/_default.sass */
+body {
+  background-color: white;
+  font-family: sans-serif;
+  font-size: 16px;
+  color: #798795;
+}
+
+/* line 7, ../sass/_default.sass */
+a {
+  text-decoration: none;
+}
+
+/* line 10, ../sass/_default.sass */
+h1 {
+  text-align: center;
+  color: white;
+  background-color: #2c3e50;
+  top: 0;
+  padding: 1em;
+  font-size: 1.5em;
+  font-weight: 700;
+}
+
+/* line 19, ../sass/_default.sass */
+hr {
+  height: 1px;
+}
+
+/* line 22, ../sass/_default.sass */
+form {
+  text-align: center;
+}
+
+/* line 25, ../sass/_default.sass */
+input[type="submit"] {
+  background-color: #1abc9c;
+  width: 90%;
+  border: none;
+  color: white;
+  padding: 1em;
+  margin-top: 2em;
+  font-size: 1em;
+  -webkit-appearance: none;
+  -webkit-border-radius: 8px;
+  -moz-border-radius: 8px;
+  -ms-border-radius: 8px;
+  -o-border-radius: 8px;
+  border-radius: 8px;
+}
+/* line 35, ../sass/_default.sass */
+input[type="submit"]:hover, input[type="submit"]:active {
+  background-color: #16a085;
+}
+
+/* line 38, ../sass/_default.sass */
+.item {
+  overflow: hidden;
+  *zoom: 1;
+  padding: 1em;
+  margin: 0 auto;
+}
+/* line 42, ../sass/_default.sass */
+.item h2 {
+  display: -moz-inline-stack;
+  display: inline-block;
+  vertical-align: middle;
+  *vertical-align: auto;
+  zoom: 1;
+  *display: inline;
+  vertical-align: middle;
+  font-size: 1.2em;
+  width: 49%;
+  font-weight: 700;
+  top: 0;
+}
+/* line 49, ../sass/_default.sass */
+.item p {
+  display: -moz-inline-stack;
+  display: inline-block;
+  vertical-align: middle;
+  *vertical-align: auto;
+  zoom: 1;
+  *display: inline;
+  vertical-align: middle;
+  width: 49%;
+  text-align: right;
+  top: 0;
+}

data/lib/whipped-cream/public/assets/stylesheets/baseline.compress.css

@@ -0,0 +1,13 @@
+/* Baseline - a designer framework, Copyright (C) 2009 Stephane Curzi, ProjetUrbain.com, Creative Commons Attribution-Share Alike 3.0 License */
+/* reset */
+html,body,div,span,a,img,h1,h2,h3,h4,h5,h6,hgroup,p,dl,dialog,dt,dd,ol,ul,li,abbr,acronym,address,b,big,blockquote,cite,code,del,dfn,em,i,ins,kbd,pre,q,samp,tt,var,small,strong,sub,sup,object,iframe,form,fieldset,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,footer,header,nav,section,figure,menu,time,mark,audio,video{font-family:inherit;font-size:100%;font-weight:inherit;font-style:inherit;vertical-align:baseline;white-space:normal;text-align:left;margin:0;padding:0;border:0;outline:0;background:transparent}textarea{font-family:inherit;font-size:100%;font-weight:normal;font-style:normal;white-space:normal;text-align:left;margin:0;padding:0}article,aside,footer,header,nav,section,dialog,figure,hgroup,menu{display:block}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}del,ins{text-decoration:none}ol,ul{list-style:none}nav ul{list-style-type:none}table{border-collapse:separate;border-spacing:0;background-color:transparent;width:auto;height:auto}:focus{outline:0}blockquote:before,blockquote:after,q:before,q:after{content:""}blockquote,q{quotes:"" ""}input{margin:0}applet,basefont,dir,font,isindex,menu,s,strike,u{font-family:inherit;font-size:100%;font-weight:normal;font-style:normal;white-space:normal;vertical-align:baseline;text-decoration:inherit;text-align:left;color:inherit;margin:0;padding:0;border:0;outline:0}dir,menu{list-style:none}nobr{white-space:normal}blink{text-decoration:none}marquee{overflow:visible}
+/* base */
+body{font-family:helvetica,arial,sans-serif;line-height:1.5;background:white;color:black}h1,h2,h3,h4,h5,h6{line-height:1.2}h4,h5,h6{font-weight:bold}b,strong,caption,th,thead,dt,legend{font-weight:bold}cite,dfn,em,i{font-style:italic}code,kbd,samp,pre,tt,var{font-family:mono-space,monospace}h1,h2,h3,h4,h5,h6{word-spacing:-0.125em}p{word-spacing:0.125em;hyphenate:auto;hyphenate-lines:3}p+p{text-indent:1.5em}p+p.no-indent{text-indent:0}pre{white-space:pre}del{text-decoration:line-through}mark{background:rgba(255, 255, 0, 0.4);padding:0 .25em}ins{color:#f00}small,sup,sub{font-size:80%}big{font-size:125%;line-height:80%}abbr,acronym{font-size:85%;text-transform:uppercase;letter-spacing:.1em}abbr[title],acronym[title],dfn[title]{border-bottom:1px dotted black;cursor:help}sup,sub{line-height:0}sup{vertical-align:super}sub{vertical-align:sub}blockquote{padding:1.5em}hr{border:none;background:#ddd;width:100%}ul,ol{margin-left:1.5em}ul{list-style:disc outside}ol{list-style:decimal outside}input,select,button{cursor:pointer}table{font:inherit;width:100%}article,aside,header,hgroup,nav,figure,section,footer{display:block}.debug{outline:solid gold 1px}.debug-background{background:rgba(255, 215, 0, 0.2) !important}
+/* type */
+body{font-size:75%;line-height:1.5}h1,h2,h3,h4,h5,h6{position:relative}h1,h2{line-height:36px;margin-bottom:18px}h1,h2,h3,h4{margin-top:18px}h3,h4,h5,h6{line-height:18px}h1{font-size:36px;top:5px}h2{font-size:28px;top:8px}h3{font-size:22px;top:1px}h4{font-size:18px;top:2px}h5{font-size:15px;top:4px}h6{font-size:13px;top:5px}h1:first-child,h2:first-child,h3:first-child,h4:first-child{margin-top:0}p,pre,address{font-size:13px;line-height:18px;position:relative;top:5px}small{font-size:11px}abbr,code,kbd,samp,small,var{line-height:15px}ul,ol,dl,dialog{font-size:13px;line-height:18px;position:relative;top:5px;margin-top:18px;margin-bottom:18px}li ul,li ol,ul ul,ol ol{top:0;margin-top:0;margin-bottom:0}li h1,li h2,li h3,li h4,li h5,li h6,li p{top:0}form,legend,label{font-size:13px;line-height:18px}legend{position:relative;top:5px}table{font-size:13px}caption{font-size:13px;line-height:18px;position:relative}hr{position:relative;height:4px;margin:18px 0 14px 0}
+/* table */
+table{border-collapse:collapse;border-top:solid 3px #000;position:relative;margin-top:18px}th,td{line-height:18px;padding:9px 18px 8px 0}thead th,thead td{padding-top:7px}tfoot th,tfoot td{padding-bottom:8px}tbody th,tbody td,tfoot th,tfoot td{border-top:solid 1px #000} th:first-child,td:first-child{padding-left:0}th:last-child,td:last-child{padding-right:0}tr:nth-child(even) td{}tbody tr:nth-child(odd) th,tbody tr:nth-child(odd) td{background:rgba(0, 0, 0, 0.035)}caption{top:5px;margin-bottom:18px}
+/* form */
+form{overflow:auto}legend{padding-bottom:18px}label{width:100%;position:relative;top:5px;margin-bottom:18px;line-height:18px;display:block}input[type="text"],input[type="password"],input[type="select"],input[type="search"]{width:100%;margin-bottom:-1px;display:block}input[type="radio"]{top:-1px;margin:0 4px 3px 1px}input[type="checkbox"]{top:-2px;margin:0 4px 3px 1px}input[type="file"]{margin:0px 6px 3px 6px}input[type="submit"],input[type="reset"],input[type="button"]{position:relative;top:5px;margin-bottom:18px}select{display:block;margin:0px}textarea{width:99%;line-height:18px;margin-bottom:-2px;display:block;clear:left;overflow:auto}
+/* grid */
+#page{width:990px;position:relative}#page:after{content:".";display:block;height:0;clear:both;visibility:hidden}.column{margin-left:18px;display:block;float:left}.colgroup{display:block;float:left}.first{margin-left:0;clear:left}.gutter{margin-left:18px}.no-gutter{margin-left:0}.align-left{float:left}.align-right{float:right;text-align:right}.clear{float:left}header,section{padding-bottom:18px}.leading{margin-bottom:18px}.noleading{margin-bottom:0 !important}.width1{width:234px}.width2{width:486px}.width3{width:738px}.width4{width:990px;margin-left:0 !important}.full{display:block;float:left;width:100%;margin-left:0 !important}.unitx1{width:108px}.unitx2{width:234px}.unitx3{width:360px}.unitx4{width:486px}.unitx5{width:612px}.unitx6{width:738px}.unitx7{width:864px}.unitx8{width:990px;margin-left:0 !important}.columnsx2{-webkit-column-count:2;-webkit-column-gap:18px;-moz-column-count:2;-moz-column-gap:18px;column-count:2;column-gap:18px}.columnsx4{-webkit-column-count:4;-webkit-column-gap:18px;-moz-column-count:4;-moz-column-gap:18px;column-count:4;column-gap:18px}th.width1,td.width1{width:234px}th.width2,td.width2{width:486px}th.width3,td.width3{width:738px}th.width4,td.width4{width:990px}th.unitx1,th.unitx1{width:108px}th.unitx2,td.unitx2{width:234px}th.unitx3,td.unitx3{width:360px}th.unitx4,td.unitx4{width:486px}th.unitx5,td.unitx5{width:612px}th.unitx6,td.unitx6{width:738px}th.unitx7,td.unitx7{width:864px}th.unitx8,td.unitx8{width:990px}label.width1,label.width2,label.width3,label.width4{margin-left:18px;float:left}label.unitx1,label.unitx2,label.unitx3,label.unitx4,label.unitx5,label.unitx6,label.unitx7,label.unitx8{margin-left:18px;float:left}label.first{margin-left:0}label.width4,label.unitx8{width:990px;overflow:hidden}label.width1 input[type="text"],label.width1 input[type="password"],label.width1 input[type="select"],label.width1 input[type="search"]{width:228px}label.width2 input[type="text"],label.width2 input[type="password"],label.width2 input[type="select"],label.width2 input[type="search"]{width:480px}label.width3 input[type="text"],label.width3 input[type="password"],label.width3 input[type="select"],label.width3 input[type="search"]{width:732px}label.width4 input[type="text"],label.width4 input[type="password"],label.width4 input[type="select"],label.width4 input[type="search"]{width:984px}label.width1 select{width:234px}label.width2 select{width:486px}label.width3 select{width:738px}label.width4 select{width:990px}label.unitx1 input[type="text"],label.unitx1 input[type="password"],label.unitx1 input[type="select"],label.unitx1 input[type="search"]{width:102px}label.unitx2 input[type="text"],label.unitx2 input[type="password"],label.unitx2 input[type="select"],label.unitx2 input[type="search"]{width:228px}label.unitx3 input[type="text"],label.unitx3 input[type="password"],label.unitx3 input[type="select"],label.unitx3 input[type="search"]{width:354px}label.unitx4 input[type="text"],label.unitx4 input[type="password"],label.unitx4 input[type="select"],label.unitx4 input[type="search"]{width:480px}label.unitx5 input[type="text"],label.unitx5 input[type="password"],label.unitx5 input[type="select"],label.unitx5 input[type="search"]{width:606px}label.unitx6 input[type="text"],label.unitx6 input[type="password"],label.unitx6 input[type="select"],label.unitx6 input[type="search"]{width:732px}label.unitx7 input[type="text"],label.unitx7 input[type="password"],label.unitx7 input[type="select"],label.unitx7 input[type="search"]{width:858px}label.unitx8 input[type="text"],label.unitx8 input[type="password"],label.unitx8 input[type="select"],label.unitx8 input[type="search"]{width:984px}label.unitx1 select{width:108px}label.unitx2 select{width:234px}label.unitx3 select{width:360px}label.unitx4 select{width:486px}label.unitx5 select{width:612px}label.unitx6 select{width:738px}label.unitx7 select{width:864px}label.unitx8 select{width:990px}

data/lib/whipped-cream/runner.rb

@@ -54,17 +54,27 @@ module WhippedCream
 
     def configure_sensors
       plugin.sensors.each do |sensor|
-        create_pin sensor, direction: :in
+        if sensor.pin
+          define_sensor_method_with_pin sensor
+        else
+          define_sensor_method_with_block sensor
+        end
+      end
+    end
 
-        define_singleton_method sensor.id do
-          if sensor.pin
-            pin = pins[sensor.id]
+    def define_sensor_method_with_pin(sensor)
+      create_pin sensor, direction: :in
 
-            pin.value == 1 ? sensor.high : sensor.low
-          else
-            sensor.block.call
-          end
-        end
+      define_singleton_method sensor.id do
+        pin = pins[sensor.id]
+
+        pin.value == 1 ? sensor.high : sensor.low
+      end
+    end
+
+    def define_sensor_method_with_block(sensor)
+      define_singleton_method sensor.id do
+        sensor.block.call
       end
     end
 

data/lib/whipped-cream/version.rb

@@ -1,3 +1,3 @@
 module WhippedCream
-  VERSION = "0.0.1pre2"
+  VERSION = "0.0.1pre3"
 end

data/lib/whipped-cream/views/layout.erb

@@ -2,7 +2,8 @@
 <html>
   <head>
     <title><%= title %></title>
-    <link href="/assets/application.css" media="screen" rel="stylesheet" type="text/css">
+    <link href="/assets/stylesheets/baseline.compress.css" media="screen" rel="stylesheet" type="text/css">
+    <link href="/assets/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css">
     <meta content="width=device-width" name="viewport">
   </head>
   <body>

data/lib/whipped-cream/views/sensor.erb

@@ -1,2 +1,4 @@
-<h2><%= control.name %></h3>
-<p><%= runner.send(control.id) %><p>
+<div class="item">
+  <h2><%= control.name %></h2>
+  <p><%= runner.send(control.id) %></p>
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whipped-cream
 version: !ruby/object:Gem::Version
-  version: 0.0.1pre2
+  version: 0.0.1pre3
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-05 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -200,7 +200,12 @@ files:
 - lib/whipped-cream/deployer.rb
 - lib/whipped-cream/pi_piper.rb
 - lib/whipped-cream/plugin.rb
-- lib/whipped-cream/public/assets/application.css
+- lib/whipped-cream/public/assets/config.rb
+- lib/whipped-cream/public/assets/sass/_default.sass
+- lib/whipped-cream/public/assets/sass/_variables.sass
+- lib/whipped-cream/public/assets/sass/application.sass
+- lib/whipped-cream/public/assets/stylesheets/application.css
+- lib/whipped-cream/public/assets/stylesheets/baseline.compress.css
 - lib/whipped-cream/runner.rb
 - lib/whipped-cream/sensor.rb
 - lib/whipped-cream/server.rb

data/lib/whipped-cream/public/assets/application.css

@@ -1,9 +0,0 @@
-body {
-  background-color: white;
-  font-family: sans-serif;
-  font-size: 16pt;
-}
-
-a {
-  text-decoration: none;
-}