voidtools 0.2.2 → 0.2.3

data/Readme.md

@@ -1,22 +1,18 @@
 # Voidtools
-#### growing toolset for Rails 3 dm+jquery+haml+warden setup flavored with:
-
-
-### building the gem locally and installing it in one line (for trying things and stuff):
-
-gem build voidtools.gemspec; gem install voidtools-0.2.1.gem
-
+#### growing toolset for Rails 3 and Sinatra with DataMapper and HAML class and helper modules
 
 ---
 
 ### DataMapper
-- `error_messages_for`
-
-### Haml
-- soon...
+- form helpers: error_messages_for
+- name url
+- pagination
 
-### Warden, Devise
-- soon...
+### Sinatra
+- view helpers
+  - link_to
+  - image tag
+  - include_assets (include_js, include_css)
 
 note: ruby 1.9 required
 
@@ -33,4 +29,4 @@ or
 
 ### Build & install
 
-gem build voidtools.gemspec; gem install voidtools-0.1.2.gem
+gem build voidtools.gemspec; gem install voidtools-0.2.3.gem

data/lib/voidtools/cap/deploy.rb

@@ -0,0 +1,152 @@
+
+set :application, "thorrents"
+
+#set :domain,      "krikri.makevoid.com"
+set :domain,      "ovh.makevoid.com"
+
+# git
+
+# #set :repository,  "svn://#{domain}/svn/#{application}"
+# #default_run_options[:pty] = true  # Must be set for the password prompt from git to work
+set :repository, "git://github.com/makevoid/thorrents.git"  # public
+
+set :scm, "git"
+set :branch, "master"
+set :deploy_via, :remote_cache
+
+set :password, File.read("/Users/makevoid/.password").strip.gsub(/33/, '')
+
+
+set :user,        "www-data"
+
+set :use_sudo,    false
+set :deploy_to,   "/www/#{application}"
+
+
+
+# set :scm_username, "makevoid"
+# set :scm_password, File.read("/home/www-data/.password").strip
+
+role :app, domain
+role :web, domain
+role :db,  domain, :primary => true
+
+
+
+
+after :deploy, "deploy:cleanup"
+#after :deploy, "db:seeds"
+
+namespace :deploy do
+  
+  desc "Restart Application"
+  task :restart, :roles => :app do
+    run "touch #{current_path}/tmp/restart.txt"
+  end
+  
+end
+
+namespace :bundle do
+  desc "Install gems with bundler"
+  task :install do
+    run "cd #{current_path}; bundle install --relock"
+  end
+  
+  desc "Commit, deploy and install"
+  task :installscom do
+    `svn commit -m ''`
+    `cap deploy`
+    `cap bundle:install`
+  end
+end
+
+# ...
+
+namespace :bundler do
+  task :create_symlink, :roles => :app do
+    shared_dir = File.join(shared_path, 'bundle')
+    release_dir = File.join(current_release, '.bundle')
+    run("mkdir -p #{shared_dir} && ln -s #{shared_dir} #{release_dir}")
+  end
+  
+  task :bundle_new_release, :roles => :app do
+    bundler.create_symlink
+    run "cd #{release_path} && bundle install --without test"
+  end
+  
+  task :lock, :roles => :app do
+    run "cd #{current_release} && bundle lock;"
+  end
+  
+  task :unlock, :roles => :app do
+    run "cd #{current_release} && bundle unlock;"
+  end
+end
+
+# HOOKS
+after "deploy:update_code" do
+  bundler.bundle_new_release
+  # ...
+end
+
+R_ENV = "RACK_ENV"
+
+namespace :scraper do
+  desc "Run the scraper"
+  task :scrape do
+    run "cd #{current_path}; #{R_ENV}=production bundle exec rake scraper:scrape --trace"
+  end
+end
+
+
+namespace :db do
+  desc "Create database"
+  task :create do
+    run "mysql -u root --password=#{password} -e 'CREATE DATABASE IF NOT EXISTS #{application}_production;'"
+  end
+  
+  desc "Seed database"
+  task :seeds do
+    run "cd #{current_path}; #{R_ENV}=production rake db:seeds"
+  end
+  
+  desc "Migrate database"
+  task :automigrate do
+    run "cd #{current_path}; #{R_ENV}=production rake db:automigrate --trace"
+  end
+  
+  desc "Send the local db to production server"
+  task :toprod do
+    # `rake db:seeds`
+    `mysqldump -u root #{application}_development > db/#{application}_development.sql`
+    upload "db/#{application}_development.sql", "#{current_path}/db", :via => :scp
+    run "mysql -u root --password=#{password} #{application}_production < #{current_path}/db/#{application}_development.sql"
+  end
+  
+  desc "Get the remote copy of production db"
+  task :todev do
+    run "mysqldump -u root --password=#{password} #{application}_production > #{current_path}/db/#{application}_production.sql"
+    download "#{current_path}/db/#{application}_production.sql", "db/#{application}_production.sql"
+    local_path = `pwd`.strip
+    `mysql -u root #{application}_development < #{local_path}/db/#{application}_production.sql`
+    
+    
+    desc "Get the remote copy of production db [option: BACKUP]"
+    task :todev do
+      run "mysqldump -u root --password=#{password} #{application}_production > #{current_path}/db/#{application}_production.sql"
+      download "#{current_path}/db/#{application}_production.sql", "db/#{application}_production.sql"
+      local_path = `pwd`.strip
+      `mysql -u root #{application}_development < #{local_path}/db/#{application}_production.sql`
+
+      t = Time.now
+      file = "#{application}_production_#{t.strftime("%Y_%m_%d")}.sql"
+      `mv db/#{application}_production.sql db/#{file}`
+
+      if ENV["BACKUP"] != "" || ENV["BACKUP"].nil?
+        `cp db/#{file} ~/db_backups/`
+        puts "Backup saved on ~/db_backups/#{file}"
+      end
+    end
+  end
+end
+

data/lib/voidtools/dm/form_helpers.rb

@@ -8,9 +8,11 @@ module Voidtools
         entity
       end
       return nil if obj.errors.map{ |e| e } == []
-      lis = "".html_safe
-      obj.errors.map{ |e| lis << content_tag( :li, e[0].to_s) }
-      content_tag( :ul, lis, class: "error_messages")
+      haml_tag :ul, { class: "error_messages" } do
+        obj.errors.map do |err| 
+          haml_tag(:li){ haml_concat err[0].to_s } 
+        end
+      end
     end
   
   end

data/lib/voidtools/dm/paginable.rb

@@ -2,23 +2,24 @@ module Voidtools
   
   module Paginable
 
-    PER_PAGE = 70
-
     def self.included(base)
       base.send :extend, ClassMethods
     end
 
     module ClassMethods
+      def x_page
+        defined?(per_page) ? per_page : 10
+      end
+      
       def paginate(options)
         page = options[:page].to_i
         options.delete :page
-        all( options.merge(limit: PER_PAGE, offset: PER_PAGE*page) )
+        all( options.merge(limit: x_page, offset: x_page*page) )
       end
 
       def pages
-        all.count/PER_PAGE
+        all.count/x_page
       end
-    
     end
 
   end

data/lib/voidtools/sinatra/view_helpers.rb

@@ -14,6 +14,27 @@ module Voidtools
       def image_tag(url, options={})
         haml_tag :img, options.merge(src: url)
       end
+      
+      def include_assets(type, assets)
+        type_js = type == "js"
+        tag = type_js ?  "script" : "link"
+        [assets].flatten.each do |asset|
+          options = if type_js
+            { type: "text/javascript", src: "/js/#{asset}.js"  }
+          else
+            { rel: "stylesheet", href: "/css/#{asset}.css" }
+          end
+          haml_tag tag, options
+        end
+      end
+      
+      def include_js(assets)
+        include_assets "js", assets
+      end
+      
+      def include_css(assets)
+        include_assets "css", assets
+      end
     end
   end
 end

data/lib/voidtools/version.rb

@@ -1,3 +1,3 @@
 module Voidtools
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: voidtools
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors: 
 - Francesco 'makevoid' Canessa
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +01:00
+date: 2011-06-07 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +24,7 @@ extra_rdoc_files: []
 
 files: 
 - Readme.md
+- lib/voidtools/cap/deploy.rb
 - lib/voidtools/dm/form_helpers.rb
 - lib/voidtools/dm/name_url.rb
 - lib/voidtools/dm/paginable.rb
@@ -50,21 +47,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: voidtools
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: custom rails3 toolset - for dm+jquery+haml+warden setup