rupi 0.4.4 → 0.4.5

data/lib/rupi/camera.rb

@@ -17,10 +17,19 @@ module Rupi
 
     def self.capture(options = {})
       cfg = CONFIGURATION.merge(options)
-      file = Tempfile.new('snap')
+
+      path = options[:path]
+
+      if path.nil?
+        file = Tempfile.new('snap')
+        path = file.path
+      end
+
       command = "uvccapture -S#{cfg[:saturation]} -B#{cfg[:brightness]} -C#{cfg[:contrast]} -G#{cfg[:gain]} -x#{cfg[:width]} -y#{cfg[:height]}"
-      system("#{command} -o#{file.path}")
-      file
+
+      system("#{command} -o#{path}")
+
+      file || File.new(path)
     end
   end
 end

data/lib/rupi/capistrano.rb

@@ -1,15 +1,15 @@
 require 'bundler/setup'
-require 'sprinkle'
 
 Capistrano::Configuration.instance(:must_exist).load do
 
+  set :default_shell, "bash -l"
+
   namespace :deploy do
     desc 'prepare your raspberry pi for deployment'
     task :setup do
-      sprinkle_path = Gem.find_files('rupi/sprinkle.rb').first
-      $user = fetch(:user)
-      $raspberypis = find_servers(:roles => :raspberrypi).first.host
-      Sprinkle::Script.sprinkle(File.read(sprinkle_path), sprinkle_path)
+      setup_rvm
+      setup_ruby
+      setup_rupi
 
       run "mkdir -p #{deploy_to}"
 
@@ -18,8 +18,28 @@ Capistrano::Configuration.instance(:must_exist).load do
       setup_service
     end
 
+    task :setup_rvm do
+      run "test -f ~/.rvm/bin/rvm || curl -L get.rvm.io | bash -s stable", :shell => 'sh'
+    end
+
+    task :setup_ruby_dependencies do
+      run 'sudo apt-get -y install build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison subversion pkg-config'
+    end
+
+    task :setup_ruby do
+      setup_ruby_dependencies
+      put "install: --no-rdoc --no-ri\nupdate: --no-rdoc --no-ri\n", ".gemrc", :via => :scp
+      run "rvm mount -r https://s3.amazonaws.com/rvm-pi/debian/wheezy_sid/armv6l/#{Rupi::RUBY_VERSION}.tar.bz2 --verify-downloads 1"
+      run "rvm use #{Rupi::RUBY_VERSION} --default"
+    end
+
+    task :setup_rupi do
+      run 'sudo apt-get -y install uvccapture'
+      run 'gem install rupi'
+    end
+
     task :setup_service do
-      run "bash -c 'source /etc/profile.d/rvm.sh && rupi_service install #{deploy_to}/app.rb'"
+      run "rupi_service install #{deploy_to}/app.rb"
     end
 
     desc 'deploy the app'
@@ -45,7 +65,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     task :bundle do
-      run "bash -c 'source /etc/profile.d/rvm.sh && cd #{deploy_to} && bundle check || bundle install --deployment'"
+      run "cd #{deploy_to} && bundle check || bundle install"
     end
   end
 

data/lib/rupi/version.rb

@@ -1,4 +1,4 @@
 module Rupi
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
   RUBY_VERSION = 'ruby-1.9.3-p194'
 end

data/templates/Capfile.erb

@@ -1,7 +1,7 @@
 require 'rupi/capistrano'
 
 set :application, '<%= name %>'
-set :deploy_to,   "/home/pi/#{application}"
+set :deploy_to,   '/home/pi/<%= name %>'
 set :user,        'pi'
 
 role :raspberrypi, 'raspberrypi.local'

data/templates/Gemfile

@@ -4,5 +4,4 @@ gem 'rupi'
 
 group :development do
   gem 'capistrano'
-  gem 'sprinkle'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rupi
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wiringpi
@@ -90,7 +90,6 @@ files:
 - lib/rupi/capistrano.rb
 - lib/rupi/generator.rb
 - lib/rupi/pin.rb
-- lib/rupi/sprinkle.rb
 - lib/rupi/version.rb
 - lib/rupi.rb
 - templates/app.rb
@@ -111,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 322711120194126801
+      hash: -402449666898579362
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 322711120194126801
+      hash: -402449666898579362
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/rupi/sprinkle.rb

@@ -1,73 +0,0 @@
-require 'rupi/version'
-
-Sprinkle::Installers::Apt.class_eval do
-  alias_method :install_commands_original, :install_commands
-
-  def install_commands
-    "sudo #{install_commands_original}"
-  end
-end
-
-RVM_PATH = '/usr/local/rvm'
-RVM_EXECUTABLE = "#{RVM_PATH}/bin/rvm"
-
-package :rvm do
-  description 'Ruby Version Manager'
-
-  noop do
-    pre :install, "sudo curl -L get.rvm.io | sudo bash -s stable --path #{RVM_PATH}"
-  end
-
-  verify do
-    has_file RVM_EXECUTABLE
-  end
-end
-
-package :ruby_dependencies do
-  apt 'build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison subversion pkg-config'
-end
-
-package :ruby do
-  description Rupi::RUBY_VERSION
-  version Rupi::RUBY_VERSION
-  requires :rvm
-  requires :ruby_dependencies
-
-  noop do
-    pre :install, "sudo #{RVM_EXECUTABLE} mount -r https://s3.amazonaws.com/rvm-pi/debian/wheezy_sid/armv6l/#{Rupi::RUBY_VERSION}.tar.bz2 --verify-downloads 1"
-    # pre :install, "sudo #{RVM_EXECUTABLE} install #{Rupi::RUBY_VERSION} --trace"
-    post :install, "#{RVM_EXECUTABLE} use #{Rupi::RUBY_VERSION} --default"
-  end
-
-  verify do
-    has_executable "#{RVM_PATH}/rubies/#{Rupi::RUBY_VERSION}/bin/ruby"
-  end
-end
-
-package :rupi do
-  description 'Rupi'
-  requires :rvm
-  requires :ruby
-
-  apt 'uvccapture'
-
-  noop do
-    pre :install, "#{RVM_PATH}/bin/gem-#{Rupi::RUBY_VERSION} install rupi --no-rdoc --no-ri"
-  end
-
-  verify do
-    has_executable "#{RVM_PATH}/gems/#{Rupi::RUBY_VERSION}/bin/rupi"
-    has_executable 'uvccapture'
-  end
-end
-
-policy :rupi, :roles => :raspberrypi do
-  requires :rupi
-end
-
-deployment do
-  delivery :capistrano do
-    set :user, $user || 'pi'
-    role :raspberrypi, $raspberypis || 'raspberrypi.local', :primary => true
-  end
-end