whipped-cream 0.0.1pre1 → 0.0.1pre2

data/lib/whipped-cream.rb

@@ -1,8 +1,9 @@
-require "whipped-cream/builder"
-require "whipped-cream/button"
-require "whipped-cream/cli"
-require "whipped-cream/plugin"
-require "whipped-cream/runner"
-require "whipped-cream/sensor"
-require "whipped-cream/server"
-require "whipped-cream/version"
+require 'whipped-cream/builder'
+require 'whipped-cream/button'
+require 'whipped-cream/cli'
+require 'whipped-cream/deployer'
+require 'whipped-cream/plugin'
+require 'whipped-cream/runner'
+require 'whipped-cream/sensor'
+require 'whipped-cream/server'
+require 'whipped-cream/version'

data/lib/whipped-cream/cli.rb

@@ -25,13 +25,24 @@ module WhippedCream
       server.start
     end
 
+    desc "deploy PLUGIN IP", "Deploy a plugin to a Pi"
+    def deploy(plugin_name, pi_address)
+      plugin_path = resolve_plugin(plugin_name)
+
+      deployer = Deployer.new(plugin_path, pi_address)
+      deployer.deploy
+    end
+
     desc "start PLUGIN", "Start a plugin"
+    method_option :daemonize,
+      type: :boolean,
+      desc: "Run the server in the background"
     def start(plugin_name)
       plugin_path = resolve_plugin(plugin_name)
 
       plugin = Plugin.from_file(plugin_path)
       server = Server.new(plugin)
-      server.start
+      server.start(options)
     end
 
     no_tasks do

data/lib/whipped-cream/deployer.rb

@@ -0,0 +1,85 @@
+require 'net/scp'
+require 'net/ssh'
+
+module WhippedCream
+  # Prepares a Pi for deployment, and deploys a plugin
+  class Deployer
+    attr_reader :plugin_filename, :pi_address
+
+    def initialize(plugin_filename, pi_address)
+      @plugin_filename = plugin_filename
+      @pi_address = pi_address
+    end
+
+    def deploy
+      bootstrap
+      copy_plugin
+      kill_all_plugins
+      run_plugin
+    end
+
+    def scp
+      @scp ||= Net::SCP.start(*connection_arguments)
+    end
+
+    def ssh
+      @ssh ||= Net::SSH.start(*connection_arguments)
+    end
+
+    private
+
+    def connection_arguments
+      [pi_address, 'pi', { password: 'raspberry' }]
+    end
+
+    def bootstrap
+      ssh_exec <<-SCRIPT
+        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
+
+        mkdir -p ~/whipped-cream/
+      SCRIPT
+    end
+
+    def copy_plugin
+      scp_copy plugin_filename, "whipped-cream/#{plugin_filename}"
+    end
+
+    def kill_all_plugins
+      ssh_exec 'sudo pkill -9 -f whipped-cream'
+    end
+
+    def run_plugin
+      ssh_exec <<-SCRIPT
+        cd ~/whipped-cream
+        sudo whipped-cream start demo.rb
+      SCRIPT
+    end
+
+    def scp_copy(local, remote)
+      scp.upload! local, remote
+    end
+
+    def ssh_exec(command)
+      command = command.prepend("set -ex\n")
+
+      ssh.open_channel do |channel|
+        channel.exec command do |process|
+          process.on_data do |_, data|
+            $stdout.print data
+          end
+
+          process.on_extended_data do |_, _, data|
+            $stderr.print data
+          end
+        end
+      end.wait
+    end
+  end
+end

data/lib/whipped-cream/server.rb

@@ -9,11 +9,11 @@ module WhippedCream
       @plugin = plugin
     end
 
-    def start
+    def start(options = {})
       ensure_routes_built
       ensure_runner_started
 
-      start_web
+      start_web(options)
     end
 
     def runner
@@ -38,8 +38,10 @@ module WhippedCream
       @routes_built ||= build_routes || true
     end
 
-    def start_web
-      Rack::Server.start app: web, port: port
+    def start_web(options = {})
+      options = options.merge({ app: web, port: port })
+
+      Rack::Server.start options
     end
 
     def build_routes

data/lib/whipped-cream/version.rb

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

data/spec/lib/whipped-cream/cli_spec.rb

@@ -15,6 +15,7 @@ describe WhippedCream::CLI do
         button "Open/Close", pin: 1
     PLUGIN
   }
+  let(:pi_address) { "192.168.0.123" }
   let(:tmpdir) { Dir.mktmpdir }
 
   before do
@@ -33,20 +34,44 @@ describe WhippedCream::CLI do
     end
   end
 
-  describe "#usage" do
-    it "displays a banner and help" do
-      expect(cli).to receive(:puts).exactly(2).times
-      expect(cli).to receive(:help)
+  describe "#deploy" do
+    it "deploys a plugin to a Pi" do
+      deployer_double = double(WhippedCream::Deployer)
 
-      cli.usage
+      expect(WhippedCream::Deployer).to receive(:new) { deployer_double }
+      expect(deployer_double).to receive(:deploy)
+
+      cli.deploy(plugin_filename, pi_address)
     end
   end
 
   describe "#start" do
+    let(:server_double) { double(WhippedCream::Server) }
+
     it "starts a server for the plugin" do
-      expect(Rack::Server).to receive(:start)
+      expect(WhippedCream::Server).to receive(:new) { server_double }
+      expect(server_double).to receive(:start)
 
       cli.start(plugin_filename)
     end
+
+    context "with --daemonize" do
+      it "starts a server in the background" do
+        expect(WhippedCream::Server).to receive(:new) { server_double }
+        expect(server_double).to receive(:start).with(daemonize: true)
+
+        cli.options = { daemonize: true }
+        cli.start(plugin_filename)
+      end
+    end
+  end
+
+  describe "#usage" do
+    it "displays a banner and help" do
+      expect(cli).to receive(:puts).exactly(2).times
+      expect(cli).to receive(:help)
+
+      cli.usage
+    end
   end
 end

data/spec/lib/whipped-cream/deployer_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe WhippedCream::Deployer do
+  subject { deployer }
+  let(:deployer) { described_class.new(plugin_filename, pi_address) }
+
+  let(:plugin_filename) { 'demo.rb' }
+  let(:pi_address) { '192.168.0.123' }
+
+  let(:net_ssh_double) {
+    double(Net::SSH, exec!: nil, open_channel: double(wait: nil))
+  }
+
+  before do
+    deployer.stub :scp_copy
+    deployer.stub :ssh_exec
+  end
+
+  its(:plugin_filename) { should eq(plugin_filename) }
+  its(:pi_address) { should eq(pi_address) }
+
+  describe "#scp" do
+    it "tries to connect with pi:raspberry" do
+      expect(Net::SCP).to receive(:start).with(
+        pi_address, 'pi', password: 'raspberry'
+      )
+
+      deployer.scp
+    end
+  end
+
+  describe "#ssh" do
+    it "tries to connect with pi:raspberry" do
+      expect(Net::SSH).to receive(:start).with(
+        pi_address, 'pi', password: 'raspberry'
+      )
+
+      deployer.ssh
+    end
+  end
+
+  describe "#deploy" do
+    subject(:deploy) { deployer.deploy }
+
+    it "bootstraps the Pi" do
+      expect(deployer).to receive(:bootstrap)
+      expect(deployer).to receive(:copy_plugin)
+      expect(deployer).to receive(:kill_all_plugins)
+      expect(deployer).to receive(:run_plugin)
+
+      deploy
+    end
+
+    # xit "prompts the user for a password on failure"
+  end
+end

data/spec/lib/whipped-cream/server_spec.rb

@@ -31,9 +31,23 @@ describe WhippedCream::Server do
     ).to be_true
   end
 
-  it "starts the Sinatra application" do
-    expect(Rack::Server).to receive(:start)
+  describe "#start" do
+    it "starts a Rack server" do
+      expect(Rack::Server).to receive(:start).with(
+        app: WhippedCream::Server::Web, port: 8080
+      )
 
-    server.start
+      server.start
+    end
+
+    context "with daemonize: true" do
+      it "starts the Sinatra application" do
+        expect(Rack::Server).to receive(:start).with(
+          app: WhippedCream::Server::Web, port: 8080, daemonize: true
+        )
+
+        server.start(daemonize: true)
+      end
+    end
   end
 end

data/whipped-cream.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
+  spec.add_runtime_dependency 'net-scp'
+  spec.add_runtime_dependency 'net-ssh'
   spec.add_runtime_dependency 'pi_piper'
   spec.add_runtime_dependency 'sinatra'
   spec.add_runtime_dependency 'thor'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whipped-cream
 version: !ruby/object:Gem::Version
-  version: 0.0.1pre1
+  version: 0.0.1pre2
   prerelease: 5
 platform: ruby
 authors:
@@ -11,6 +11,38 @@ bindir: bin
 cert_chain: []
 date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pi_piper
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +197,7 @@ files:
 - lib/whipped-cream/button.rb
 - lib/whipped-cream/cli.rb
 - lib/whipped-cream/control.rb
+- lib/whipped-cream/deployer.rb
 - lib/whipped-cream/pi_piper.rb
 - lib/whipped-cream/plugin.rb
 - lib/whipped-cream/public/assets/application.css
@@ -179,6 +212,7 @@ files:
 - spec/lib/whipped-cream/builder_spec.rb
 - spec/lib/whipped-cream/button_spec.rb
 - spec/lib/whipped-cream/cli_spec.rb
+- spec/lib/whipped-cream/deployer_spec.rb
 - spec/lib/whipped-cream/plugin_spec.rb
 - spec/lib/whipped-cream/runner_spec.rb
 - spec/lib/whipped-cream/sensor_spec.rb
@@ -218,6 +252,7 @@ test_files:
 - spec/lib/whipped-cream/builder_spec.rb
 - spec/lib/whipped-cream/button_spec.rb
 - spec/lib/whipped-cream/cli_spec.rb
+- spec/lib/whipped-cream/deployer_spec.rb
 - spec/lib/whipped-cream/plugin_spec.rb
 - spec/lib/whipped-cream/runner_spec.rb
 - spec/lib/whipped-cream/sensor_spec.rb