citrin 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/citrin.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{citrin}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Mike}]

data/commands/create_svn

@@ -1,18 +1,36 @@
 #!/bin/bash
-name=$1
 
+name=$1
 if [ -z $name  ] ; then
- echo "usage: $0 appname [env]"
+ echo "usage: $0 appname [env] [options]"
  exit 1;
 fi
+
+env=$2
+if [ -z $env  ] ; then
+  env="prod"
+fi
+
 proj_owner=www-data
 svn_path=/var/svn/$name/
+
 function create_svn {
   echo "CREATING SVN"
   svnadmin create $svn_path
-  chown -R $proj_owner.www-data $svn_path
+  chown -R $USER.rails-dev $svn_path
 
-  echo "svn co svn+ssh://root@$(hostname -f)$svn_path" 
+  echo "svn co svn+ssh://$(hostname -f)$svn_path"
 }
 
 create_svn
+
+for var1 in "$@"
+do
+case $var1 in
+  --with-rails)
+   cd /var/www/rails_apps/$env/
+   svn co svn+ssh://$(hostname -f)$svn_path $name/
+   rails new $name
+   ;;
+  esac
+done

data/commands/remove_railsapp

@@ -11,12 +11,12 @@ if [ -z $name ] ; then
  exit 1;
 fi
 
-rm $prod_path$name
-rm -r $dev_path$name
-rm -r $svn_path
+rm -rf $prod_path$name
+rm -rf $dev_path$name
+rm -rf $svn_path
 
 
-rm /etc/apache2/sites-enabled/prod.$name.conf
-rm /etc/apache2/sites-enabled/dev.$name.conf
+rm -f /etc/apache2/sites-enabled/prod.$name.conf
+rm -f /etc/apache2/sites-enabled/dev.$name.conf
 
 sudo service apache2 reload

data/lib/citrin/cli.rb

@@ -4,7 +4,11 @@ class Citrin::CLI
 
   def self.start(*args)
     command = args.shift.strip rescue "help"
-    puts `#{File.dirname(__FILE__)}/../../commands/#{command} #{args.join(" ")}`
+    if command == "create_svn_rails"
+      puts `#{File.dirname(__FILE__)}/../../commands/create_svn #{args.join(" ")} --with-rails`
+    else
+      puts `#{File.dirname(__FILE__)}/../../commands/#{command} #{args.join(" ")}`
+    end
   end
 
 end

data/test/test_citrin.rb

@@ -16,7 +16,7 @@ class TestCitrin < Test::Unit::TestCase
     Citrin::CLI.start("create_webserver", @appname)
     assert File.exists?("/etc/apache2/sites-enabled/prod.#{@appname}.conf")
     `cd /var/www/rails_apps/prod/ && rails new #{@appname}`
-    statuscode = `curl -sL -w "%{http_code}" "#{@appname}.$(hostname).citrin.ch" -o /dev/null`
+    statuscode = `curl -sL -w "%{http_code}" "#{@appname}.$(hostname -f)" -o /dev/null`
     assert_equal "200", statuscode
     cleanup
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: citrin
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Mike