necktie 1.0.6 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,26 @@
+1.1.0 (2010-04-12)
+* Changed: Capistrano can pull from one of these locations ($ denotes variable):
+		$necktie_url  master
+		$necktie_url  $necktie_branch
+		$repository   necktie
+		$repository   $necktie_branch
+
+	If you use a separate repository from your main application, set necktie_url
+	to that repository.  The default branch is origin/master.
+
+	If you use the same repository as your main application, the default branch
+	is origin/necktie.  To create an empty origin/necktie branch:
+
+		$ git symbolic-ref HEAD refs/heads/necktie
+		$ rm .git/index
+		$ git clean -fdx
+    $ echo "# My Necktie file" > Necktie
+		$ git add .
+		$ git commit -a -m "First commit"
+		$ git push origin necktie
+* Added: --branch command line options to clone/update given branch.  Defaults to necktie.
+* Removed: No long supports --ref command line options. Sorry.
+
 1.0.6 (2009-12-08)
 * Fixed: cap necktie crapping on web enable/disable.
 

data/README.rdoc

@@ -75,12 +75,41 @@ only runs once, before that directory exists.
 
 I use Capistrano to setup new instances and upgrade existing ones.
 
-To use the Necktie task, set the necktie_url variable to the URL of your
-Necktie repository, and require necktie/capistrano. For example:
+You can store your Necktie files in a separate repository, or same repository as
+your application but in a separate branch.
+
+If using a separate repository, set the variable necktie_url to the URL of the
+Necktie repository.  You can also set necktie_branch to particular branch name,
+the default is master.
+
+For example:
 
   require "necktie/capistrano"
   set :necktie_url, "git@example.com:mysetup"
 
+If using the same repository and separate branch, do not set necktie_url.  You
+can set necktie_branch to a particular branch name, the default in this case is
+necktie.  You still need to require "necktie/capistrano".
+
+To create a new empty branch for Necktie that will live in the same repository
+as your application (note: make sure to commit all changes first, or you'll lose
+them):
+
+  $ git symbolic-ref HEAD refs/heads/necktie
+  $ rm .git/index
+  $ git clean -fdx
+  $ echo "# My Necktie file" > Necktie
+  $ git add .
+  $ git commit -a -m "First commit"
+  $ git push origin necktie
+
+Rather than switching back and forth, you can clone this repository within your
+application's working directory:
+
+  $ cd myapp
+  $ git clone -b necktie git:myapp.git .necktie
+  $ ls necktie
+
 Setting up a new EC2 instance:
 
   cap necktie ROLES=app HOSTS=ec2-75-101-239-12.compute-1.amazonaws.com

data/example/etc/nginx/unicorn.conf

@@ -48,4 +48,34 @@ server {
 
 }
 
+server {
+  listen 0.0.0.0:8080;
+  server_name  _;
+
+  location / {
+    root /var/myapp/current/public/;
+    if (-f $request_filename) {
+      break;        # Static asset
+    }
+    error_page 500 501 502 503 504 /500.html;
+    proxy_pass              http://unicorn;
+    proxy_set_header        Host $host;       
+    proxy_set_header        X-Real-IP       $remote_addr;
+    proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+    client_max_body_size    10m;
+    client_body_buffer_size 128k;
+    proxy_connect_timeout   90;
+    proxy_send_timeout      90;
+    proxy_read_timeout      90;
+    proxy_buffer_size       16k;
+    proxy_buffers           32 16k;
+    proxy_busy_buffers_size 64k;
+    
+    error_page 503 /system/maintenance.html;
+    location /system/maintenance.html {
+      error_page 405 /system/maintenance.html;
+      rewrite ^ /system/maintenance.html break;
+    }
+  }
+}
 

data/lib/necktie/application.rb

@@ -10,6 +10,7 @@ module Necktie
       @rakefiles = ["Necktie", "necktie", "Necktie.rb", "necktie.rb"]
       options.nosearch = true
       options.env = "production"
+      options.branch = "necktie"
     end
 
     def run
@@ -19,15 +20,14 @@ module Necktie
         if File.exist?(repo)
           Dir.chdir repo do
             puts "Pulling latest updates to #{repo} ..."
-            sh "git pull origin master", :verbose=>false
-          end if options.pull
+            sh "git pull origin #{options.branch}"
+          end
         else
           options.git_url or fail "Need to set Git URL: use --source command line option"
           puts "Cloning #{options.git_url} to #{repo}"
-          sh "git clone #{options.git_url} #{repo.inspect}", :verbose=>false
+          sh "git clone --branch #{options.branch} #{options.git_url} #{repo.inspect}"
         end
         Dir.chdir repo do
-          sh "git checkout #{options.ref}" if options.ref
           @sha = `git rev-parse --verify HEAD --short`.strip
           puts "(in #{Dir.pwd}, head is #{@sha}, environment is #{options.env})"
           syslog :info, "environment is %s", options.env
@@ -49,8 +49,8 @@ module Necktie
         ['--source', '-S GIT_URL', "Git URL to your Necktie repository",
           lambda { |value| options.git_url = value }
         ],
-        ['--ref', '-R REF', "Checkout specific reference (commit, tag, tree)",
-          lambda { |value| options.ref = value }
+        ['--branch', '-B BRANCH', "Checkout specific branch (default is necktie)",
+          lambda { |value| options.branch = value }
         ],
         ['--update', '-U', "Update .necktie directory (git pull)",
           lambda { |value| options.pull = true }

data/lib/necktie/capistrano.rb

@@ -12,8 +12,10 @@ Capistrano::Configuration.instance.load do
 
     desc "[internal] Pull updates from Git"
     task :pull do
-      fail "You need to set :necktie_url, <git_url>" unless necktie_url
-      sudo "necktie --environment #{fetch(:rails_env, "production")} --source #{necktie_url} --update"
+      url = fetch(:necktie_url, repository) # necktie_url+origin/master or repository+origin/necktie
+      branch = fetch(:necktie_branch, exists?(:necktie_url) ? "master" : "necktie")
+      puts " ** Pulling from #{url} #{branch}"
+      sudo "necktie --environment #{fetch(:rails_env, "production")} --source #{url} --branch #{branch}"
     end
 
     desc "[internal] Run necktie upgrade"
@@ -26,7 +28,6 @@ Capistrano::Configuration.instance.load do
 
     desc "Run necktie on all servers (you can use HOSTS or RAILS env vars)"
     task :default do
-      fail "You need to set :necktie_url, <git_url>" unless necktie_url
       install
       pull
       upgrade

data/necktie.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name           = "necktie"
-  spec.version        = "1.0.6"
+  spec.version        = "1.1.0"
   spec.author         = "Assaf Arkin"
   spec.email          = "assaf@labnotes.org"
   spec.homepage       = "http://github.com/assaf/necktie"

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: necktie
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 -08:00
+date: 2010-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -256,7 +261,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- Necktie 1.0.6
+- Necktie 1.1.0
 - --main
 - README.rdoc
 - --webcvs
@@ -267,18 +272,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Dress to impress