bonethug 0.0.55 → 0.0.59

data/README.md

@@ -33,7 +33,7 @@ execute:
 
 update the bonethug files in your project:
 
-    `bundle exec bonethug update`
+    `bundle exec thug update`
 
 
 
@@ -48,7 +48,7 @@ Usage
 
 **Set up a project Skeleton**
 
-`bonethug install {rails3|silverstripe3|drupal|php|sinatra}`
+`thug install {rails3|silverstripe3|drupal|php|sinatra}`
 
 
 
@@ -56,7 +56,7 @@ Usage
 
 *If you just want to use the deploy / cron / backup framework*
 
-`bonethug init`
+`thug init`
 
 
 
@@ -65,7 +65,7 @@ Usage
 *This updates the .bonethug/deploy.rb, .bonethug/backup.rb,
 config/example/cnf.yml, config/example/schedule.rb config files*
 
-`bonethug update`
+`thug update`
 
 
 
@@ -74,7 +74,7 @@ config/example/cnf.yml, config/example/schedule.rb config files*
 *Configure the watch in the config/cnf.yml.  Uses vanilla coffeescript and sass
 compilers by default, but can use sprockets if passed the sprockets argument*
 
-`bonethug watch [sprockets]`
+`thug watch [sprockets]`
 
 
 
@@ -83,12 +83,14 @@ compilers by default, but can use sprockets if passed the sprockets argument*
 *Uses astrails-safe to make a backup using the .bonethug/backup.rb file.  Uses
 the info contained in cnf.yml*
 
-`bonethug local-backup {development|staging|production}`
+`thug local-backup {development|staging|production}`
 
 
 
 ### Remote Commands
 
+*UPDATE:* Bonethug now supports interactive prompts so this may no longer be necessary
+
 Most of these are piped through mina.  Mina uses SSH to send a bash script to
 the remote server where it is executed.  For these commands to work you need to
 have the desired host already added to your known hosts file: ~/.ssh/known_hosts
@@ -103,14 +105,17 @@ Host *
     UserKnownHostsFile=/dev/null
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+**Setup a remote server**
 
+*This wraps mina to call all the commandsThis installs all the required software on a remote server*
+`thug setup_env {development|staging|production}`
 
 **Setup and Deploy to Remote Server**
 
 *This wraps mina and deploys using the information contained in cnf.yml*
 
-`bonethug setup {development|staging|production}`  
-`bonethug deploy {develoment|staging|production}`
+`thug setup {development|staging|production}`  
+`thug deploy {develoment|staging|production}`
 
 
 
@@ -122,7 +127,7 @@ It calls astrails-safe on the remote server and using the remote
 If you are using FTP, make sure the directory exists before triggering a
 backup.*
 
-`bonethug remote-backup {develoment|staging|production}`
+`thug remote-backup {develoment|staging|production}`
 
 
 
@@ -137,9 +142,9 @@ as it keeps the password out of the log files.*
 BE CAREFUL USING SYNC-TO - if there are no files in the source location it will
 wipe the files from your deploy copy.
 
-`bonethug sync-from {develoment|staging|production}`
+`thug sync-from {develoment|staging|production}`
 
-`bonethug sync-to {develoment|staging|production}`
+`thug sync-to {develoment|staging|production}`
 
   
 
@@ -147,6 +152,8 @@ wipe the files from your deploy copy.
 Contributing
 ------------
 
-1.  Fork it 2. Create your feature branch (`git checkout -b my-new-feature`) 3.
-    Commit your changes (`git commit -am 'Add some feature'`) 4. Push to the
-    branch (`git push origin my-new-feature`) 5. Create new Pull Request
+1.  Fork it 
+2.  Create your feature branch (`git checkout -b my-new-feature`) 
+3.  Commit your changes (`git commit -am 'Add some feature'`) 
+4.  Push to the branch (`git push origin my-new-feature`) 
+5.  Create new Pull Request

data/bin/bonethug

@@ -5,4 +5,4 @@ root_path = File.expand_path(File.dirname(__FILE__)) + '/..'
 require 'rubygems' unless Object.const_defined?(:Gem)
 require root_path +'/lib/bonethug'
 
-Bonethug::CLI.handle
+Bonethug::CLI.handle 'bonethug'

data/bin/thug

@@ -5,4 +5,4 @@ root_path = File.expand_path(File.dirname(__FILE__)) + '/..'
 require 'rubygems' unless Object.const_defined?(:Gem)
 require root_path +'/lib/bonethug'
 
-Bonethug::CLI.handle
+Bonethug::CLI.handle 'thug'

data/config/deploy.rb

@@ -14,6 +14,7 @@
 
 require 'rubygems'
 require 'bonethug/conf'
+require 'bonethug/installer'
 require 'mina/bundler'
 require 'mina/rails'
 require 'mina/git'
@@ -127,7 +128,14 @@ task :update_packages => :environment do
   queue! %[php #{deploy_to}/current/public/framework/cli-script.php dev/build] if ['silverstripe','silverstripe3'].include? deploy.get('project_type') 
 end
 
-desc "Restores application state to the most recent backup"
+desc "Sets up an environemt"
+task :setup_env => :environment do
+  Bonethug::Installer.get_setup_env_cmds.each do |cmd| 
+    queue! %[#{cmd}]
+  end
+end
+
+desc "Initialises the db"
 task :init_db => :environment do
   queue! %[cd #{deploy_to}/current && bundle exec rake db:reset RAILS_ENV="#{env}"] if deploy.get('project_type') =~ /rails[0-9]?/
 end

data/lib/bonethug/cli.rb

@@ -1,7 +1,7 @@
 module Bonethug
   class CLI
 
-    def self.handle
+    def self.handle(bin_name = 'thug')
 
       # what are we doing?
       task = ARGV[0] || 'help'
@@ -25,13 +25,32 @@ module Bonethug
 
         # validate
         unless type
-          puts 'Usage: bonethug install [type] [location]'
+          puts 'Usage: ' + bin_name + ' install [type] [location]'
           return
         end
         
         # run the installer
         Installer.install type, location
 
+      when 'setup_env'
+
+        # handle args
+        env = ARGV[1]
+
+        # validate
+        unless env
+          puts 'Usage: ' + bin_name + ' setup_env environment'
+          return
+        end
+
+        if env == 'local'
+          gem_dir = File.expand_path File.dirname(__FILE__) + '/../..'
+          script = gem_dir '/scripts/ubuntu_setup.sh'
+          exec 'sudo bash ' + script
+        else
+          exec "export to=#{env} && bundle exec mina -f .bonethug/deploy.rb setup_env --verbose"
+        end     
+
       when 'init', 'update'
 
         # handle args
@@ -39,7 +58,7 @@ module Bonethug
 
         # validate
         unless location
-          puts 'Usage: bonethug #{task} [location]'
+          puts 'Usage: ' + bin_name + ' #{task} [location]'
           return
         end
 
@@ -93,7 +112,7 @@ module Bonethug
 
         # validate
         unless environment
-          puts 'Usage: bonethug #{task} [environment]' 
+          puts 'Usage: thug #{task} [environment]' 
           return
         end
 
@@ -155,8 +174,8 @@ module Bonethug
 
     end
 
-    def self.display_help
-      puts 'Usage: bonethug task [argument]...'
+    def self.display_help(bin_name = 'thug')
+      puts 'Usage:  ' + bin_name + '  task [argument]...'
     end
 
   end

data/lib/bonethug/installer.rb

@@ -130,6 +130,16 @@ module Bonethug
       self
     end
 
+    def self.get_setup_env_cmds
+        File.read(@@bonthug_gem_dir + '/scripts/ubuntu_setup.sh')
+            .split("\n")
+            .each { |line| 
+              return false if line =~ /^[\s\t]+$/
+              return false if line =~ /^[\s\t]*#/
+              true
+            }
+    end
+
     protected
 
     def self.try_delete(file)

data/lib/bonethug/version.rb

@@ -1,6 +1,6 @@
 
-      module Bonethug
-        VERSION = "0.0.55"
-        BUILD_DATE = "2013-10-16 13:37:14 +1300"
-      end
-    
+        module Bonethug
+          VERSION = "0.0.59"
+          BUILD_DATE = "2013-10-17 20:04:25 +1300"
+        end
+      

data/lib/bonethug.rb

@@ -5,9 +5,15 @@ require "bonethug/cli"
 
 module Bonethug
 
-  def self.update_version(value)
+  def self.increment_version
+
+    version = VERSION.split('.')
+    version[version.length-1] = (version.last.to_i + 1).to_s
+    version = version.join('.') 
+
     remove_const 'VERSION'
-    const_set 'VERSION', value
+    const_set 'VERSION', version
+
   end
 
 end

data/lib/tasks/bonethug.rake

@@ -1,75 +1,68 @@
 require File.expand_path(File.dirname(__FILE__) + "/../bonethug")
 
-namespace :bonethug do
+namespace :thug do
 
-  desc "build the gem + increment build num if pkg exists for v" + Bonethug::VERSION
-  task :build do
-
-    # handle paths
-    ver_path = File.expand_path File.dirname(__FILE__) + '/../bonethug/version.rb'
-    pkg_path = File.expand_path File.dirname(__FILE__) + '/../../pkg/bonethug-' + Bonethug::VERSION + '.gem'    
+  def update_version_file(content = nil)
 
-    # handle version
-    if File.exists? pkg_path
+    unless content
 
-      version = Bonethug::VERSION.split('.')
-      version[version.length-1] = (version.last.to_i + 1).to_s
-      version = version.join('.')
-
-      Bonethug::update_version version
-
-      puts "Building version " + Bonethug::VERSION + '...'
+      # generate content for version file
+      content = '
+        module Bonethug
+          VERSION = "' + Bonethug::VERSION + '"
+          BUILD_DATE = "' + Time.now.to_s + '"
+        end
+      '
 
     end
 
-    # generate content for version file
-    content = '
-      module Bonethug
-        VERSION = "' + Bonethug::VERSION + '"
-        BUILD_DATE = "' + Time.now.to_s + '"
-      end
-    '
+    # handle paths
+    ver_path = File.expand_path File.dirname(__FILE__) + '/../bonethug/version.rb'
 
     # write data
     File.open(ver_path,'w') do |file| 
       file.puts content
     end
 
+  end
+
+  desc "Runs rake build + some other stuff"
+  task :vup do
+
+    puts "was " + Bonethug::VERSION
+
+    Bonethug::increment_version
+    update_version_file
+
+    puts "now " + Bonethug::VERSION
+
+  end  
+
+  desc "Runs rake build + some other stuff"
+  task :build do
+
+    # update version file
+    update_version_file
+
     # invoke the build script
     Rake::Task["build"].invoke
 
   end
 
-  desc "pushes v" + Bonethug::VERSION + " (runs bonethug:build if no pkg exists for v" + Bonethug::VERSION + " )"
-  task :push do
+  desc "Runs rake release + bonethug:build"
+  task :release do
 
     # handle path
     path = File.expand_path File.dirname(__FILE__) + '/../../pkg/bonethug-' + Bonethug::VERSION + '.gem'
 
     # check if there's a build with the current version
-    unless File.exists? path
-      Rake::Task["bonethug:build"].invoke
-    end
+    Rake::Task["thug:build"].invoke
 
     # push the current version
     # we redefine the path because the version constant may have changed 
     # -> the reason being that the parent build script uses that constant to name the gem package
-    exec 'gem push ' + 'pkg/bonethug-' + Bonethug::VERSION + '.gem'
-
-  end
-
-  desc "runs bonethug:build then bonethug:push"
-  task :build_and_push do
-
-    # invoke the build script
-    Rake::Task["bonethug:build"].invoke
-    Rake::Task["bonethug:push"].invoke
-
-  end
+    exec "rake release --trace"
 
-  desc "alias for build + push the gem"
-  task :bp do
-    Rake::Task["bonethug:build_and_push"].invoke
   end
 
 end

data/scripts/ubuntu_setup.sh

@@ -4,8 +4,13 @@
 # install native stuff
 # -----------------------------------------------------
 
+# install the repo adding scripts
+sudo apt-get install software-properties-common python-software-properties
+
 # add repos
 sudo add-apt-repository ppa:richarvey/nodejs
+sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse"
+sudo add-apt-repository "deb-src http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse"
 
 # update
 sudo apt-get update && sudo apt-get upgrade
@@ -39,17 +44,21 @@ sudo apt-get install git ruby1.9.3 wkhtmltopdf nodejs npm
 #   FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -socket /var/run/php5-fpm.sock -pass-header Authorization
 # </IfModule>
 # " > /etc/apache2/conf.d/php-fpm.conf
-# sed -i -e "s/listen = \/var\/run\/php5-fpm.sock\/listen = 127.0.0.1:9000/g" /etc/php5/fpm/pool.d/www.conf
-
-# TCP
-echo "
-<IfModule mod_fastcgi.c>
-  AddHandler php5-fcgi .php
-  Action php5-fcgi /php5-fcgi
-  Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
-  FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -idle-timeout 250 -pass-header Authorization
-</IfModule>
-" > /etc/apache2/conf.d/php-fpm.conf
+# sed -i -e "s/listen = 127.0.0.1:9000/listen = \/var\/run\/php5-fpm.sock/g" /etc/php5/fpm/pool.d/www.conf
+
+## TCP
+# echo "
+# <IfModule mod_fastcgi.c>
+#   AddHandler php5-fcgi .php
+#   Action php5-fcgi /php5-fcgi
+#   Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
+#   FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -idle-timeout 250 -pass-header Authorization
+# </IfModule>
+# " > /etc/apache2/conf.d/php-fpm.conf
+# sed -i -e "s/listen = \/var\/run\/php5-fpm.sock/listen = 127.0.0.1:9000/g" /etc/php5/fpm/pool.d/www.conf
+
+sed -i -e "s/listen = \/var\/run\/php5-fpm.sock\/listen = 127.0.0.1:9000/g" /etc/php5/fpm/pool.d/www.conf
+sudo echo -e "<IfModule mod_fastcgi.c>\n AddHandler php5-fcgi .php\n Action php5-fcgi /php5-fcgi\n Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi\n FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -idle-timeout 250 -pass-header Authorization\n </IfModule>" > /etc/apache2/conf.d/php-fpm.conf
 
 # Apache
 # ------
@@ -60,8 +69,6 @@ sudo a2enmod actions fastcgi alias rewrite headers
 # phpmyadmin
 sudo ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf
 
-
-
 # -----------------------------------------------------
 # Install Gems
 # -----------------------------------------------------
@@ -72,8 +79,8 @@ sudo gem1.9.3 install mina bundler whenever astrails-safe
 # install passenger
 sudo gem1.9.3 install passenger
 sudo passenger-install-apache2-module
-touch /etc/apache2/mods-available/passenger.load
-touch /etc/apache2/mods-available/passenger.conf
+sudo touch /etc/apache2/mods-available/passenger.load
+sudo touch /etc/apache2/mods-available/passenger.conf
 
 # -----------------------------------------------------
 # Node.js related
@@ -85,6 +92,5 @@ npm install bower -g
 # Restart stuff
 # -----------------------------------------------------
 
-
 sudo service apache2 restart
 sudo /etc/init.d/php5-fpm restart

data/skel/project_types/silverstripe3/public/project/_config.php

@@ -125,6 +125,10 @@ if (!defined('SS_SITE_DATABASE_NAME'))	define('SS_SITE_DATABASE_NAME', $database
 //jpeg quality
 Config::inst()->update('GDBackend', 'default_quality', 80);
 
+// block the default page build
+SiteTree::set_create_default_pages(false);
+Config::inst()->update('SiteTree', 'create_default_pages', false);
+
 
 // --------------------------------- //
 // Assets

data/skel/project_types/silverstripe3/public/project/code/Pages/HomePage.php

@@ -0,0 +1,20 @@
+<?php
+class HomePage extends RootPage {
+
+	private static $can_be_root = true;	
+
+	private static $db = array(
+	);
+
+}
+
+class HomePage_Controller extends RootPage_Controller {
+
+	private static $allowed_actions = array (
+	);
+
+	public function init() {
+		parent::init();
+	}
+
+}

data/skel/project_types/silverstripe3/public/project/code/Pages/Page.php

@@ -3,7 +3,7 @@ class Page extends SiteTree {
 
 	protected static $page_cache = array();
 
-	private static $can_be_root = true;	
+	private static $can_be_root = false;	
 
 	private static $db = array(
 	);
@@ -50,26 +50,56 @@ class Page extends SiteTree {
 		$do->Paginator 		= $do->DataSet->Paginator->dataForTemplate($do->DataSet->unlimitedRowCount, 2, null, $hitsOptions);
 		$do->HitsSelector	= $do->Paginator->HitsSelector;
 		return $do;	
+	}
+
+	/**
+	 * Add default records to database.
+	 *
+	 * This function is called whenever the database is built, after the
+	 * database tables have all been created. Overload this to add default
+	 * records when the database is built, but make sure you call
+	 * parent::requireDefaultRecords().
+	 */
+	public function requireDefaultRecords() {
+		
+		
+		if(!SiteTree::get_by_link(Config::inst()->get('RootURLController', 'default_homepage_link'))) {
+			$homepage = new HomePage;
+			$homepage->Title = 'Home';
+			$homepage->URLSegment = Config::inst()->get('RootURLController', 'default_homepage_link');
+			$homepage->Sort = 1;
+			$homepage->write();
+			$homepage->publish('Stage', 'Live');
+			$homepage->flushCache();
+			DB::alteration_message('Home page created', 'created');
+		}
+
+		if(DB::query("SELECT COUNT(*) FROM \"SiteTree\"")->value() == 1) {
+			$aboutus = new RootPage;
+			$aboutus->Title = 'About Us';
+			$aboutus->Sort = 2;
+			$aboutus->write();
+			$aboutus->publish('Stage', 'Live');
+			$aboutus->flushCache();
+			DB::alteration_message('Book 1 created', 'created');
+
+			$contactus = new RootPage;
+			$contactus->Title = 'Contact Us';
+			$contactus->Sort = 3;
+			$contactus->write();
+			$contactus->publish('Stage', 'Live');
+			$contactus->flushCache();
+			DB::alteration_message('Book 2 created', 'created');
+		}
+		
+		// call it on the parent
+		parent::requireDefaultRecords();		
 	}	
 
+
 }
 class Page_Controller extends ContentController {
 
-	/**
-	 * An array of actions that can be accessed via a request. Each array element should be an action name, and the
-	 * permissions or conditions required to allow the user to access it.
-	 *
-	 * <code>
-	 * array (
-	 *     'action', // anyone can access this action
-	 *     'action' => true, // same as above
-	 *     'action' => 'ADMIN', // you must have ADMIN permissions to access this action
-	 *     'action' => '->checkAction' // you can only access this action if $this->checkAction() returns true
-	 * );
-	 * </code>
-	 *
-	 * @var array
-	 */
 	private static $allowed_actions = array (
 	);
 

data/skel/project_types/silverstripe3/public/project/code/Pages/RootPage.php

@@ -0,0 +1,20 @@
+<?php
+class RootPage extends Page {
+
+	private static $can_be_root = true;	
+
+	private static $db = array(
+	);
+
+}
+
+class RootPage_Controller extends Page_Controller {
+
+	private static $allowed_actions = array (
+	);
+
+	public function init() {
+		parent::init();
+	}
+
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.55
+  version: 0.0.59
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -407,7 +407,9 @@ files:
 - skel/project_types/silverstripe3/public/project/code/Extensions/.gitkeep
 - skel/project_types/silverstripe3/public/project/code/Forms/.gitkeep
 - skel/project_types/silverstripe3/public/project/code/Objects/.gitkeep
+- skel/project_types/silverstripe3/public/project/code/Pages/HomePage.php
 - skel/project_types/silverstripe3/public/project/code/Pages/Page.php
+- skel/project_types/silverstripe3/public/project/code/Pages/RootPage.php
 - skel/project_types/silverstripe3/public/project/code/Tasks/.gitkeep
 - skel/project_types/silverstripe3/public/project/coffee/application.js.coffee
 - skel/project_types/silverstripe3/public/project/javascript/.gitkeep