capistrano-webserver 0.1.4 → 0.2.1

data/.gitignore

@@ -0,0 +1,4 @@
+pkg
+doc
+Manifest
+nbproject/

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in capistrano-webserver.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,29 @@
+PATH
+  remote: .
+  specs:
+    capistrano-webserver (0.2.1)
+      capistrano (~> 2.13.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    capistrano (2.13.5)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    highline (1.6.16)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.0.5)
+      net-ssh (>= 2.0.9)
+    net-ssh (2.6.5)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capistrano-webserver!

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Shawn Catanzarite
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,29 @@
+# Capistrano::Webserver
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'capistrano-webserver'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install capistrano-webserver
+
+## Usage
+
+TODO: Write usage instructions here
+
+## 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

data/Rakefile

@@ -1,15 +1,51 @@
-require 'rubygems'  
-require 'rake'  
-require 'echoe'  
-  
-Echoe.new('capistrano-webserver', '0.1.4') do |p|  
-  p.description     = "Common way to manage webserver (apache) configuration using capistrano"
-  p.summary         = "Common way to manage webserver configuration using capistrano. Only apache is currently supported."
-  p.url             = "http://github.com/dashonet/capistrano-webserver"  
-  p.author          = "Shawn Catanzarite"  
-  p.email           = "shawn@dasho.net"
-  p.ignore_pattern  = ["tmp/*", "script/*","nbproject/**","nbproject/private/*"]
-  p.development_dependencies = ["capistrano"]  
-end  
-  
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }  
+require "bundler/gem_tasks"
+
+def changelog(last=nil, single=false)
+  command="git --no-pager log --format='%an::::%h::::%s'"
+
+  list = `git tag`
+
+  puts "# Changelog"
+  puts
+
+  ordered = list.lines.sort_by {|e| (a,b,c) = e.gsub(/^v/,"").split("."); "%3d%3d%3d" % [a, b, c]}
+
+  ordered.reject{|e| (a,b,c,d) = e.split("."); !d.nil?}.reverse_each do |t|
+    tag = t.chomp
+
+    if last
+      check = { }
+      out   = []
+      log   = `#{command} #{last}...#{tag}`
+      log.lines.each do |line|
+        (who, hash, msg) = line.split('::::')
+        unless check[msg]
+          unless msg =~ /^Merge branch/ || msg =~ /CHANGELOG/ || msg =~ /^(v|version|changes for|preparing|ready for release|ready to release|bump version)*\s*(v|version)*\d+\.\d+\.\d+/
+            msg.gsub(" *", "\n*").gsub(/^\*\*/, "  *").lines.each do |l|
+              line = l =~ /^(\s+)*\*/ ? l : "* #{l}"
+              out << line
+            end
+            check[msg] = hash
+          end
+        end
+      end
+      puts "## #{last}:"
+      out.each { |e| puts e }
+      #puts log
+      puts
+    end
+
+    last = tag
+    exit if single
+  end
+end
+
+desc "generate changelog output"
+task :changelog do
+  changelog
+end
+
+desc "show current changes (changelog output from HEAD to most recent tag)"
+task :current do
+  changelog("HEAD",true)
+end

data/capistrano-webserver.gemspec

@@ -1,32 +1,21 @@
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'capistrano/webserver/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{capistrano-webserver}
-  s.version = "0.1.4"
+Gem::Specification.new do |gem|
+  gem.name          = "capistrano-webserver"
+  gem.version       = Capistrano::Webserver::VERSION
+  gem.authors       = ["Shawn Catanzarite"]
+  gem.email         = ["me@shawncatz.com"]
+  gem.description   = %q{Common way to manage webserver (apache) configuration using capistrano}
+  gem.summary       = %q{Common way to manage webserver (apache) configuration using capistrano}
+  gem.homepage      = "http://github.com/shawncatz/capistrano-webserver"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Shawn Catanzarite"]
-  s.date = %q{2011-05-17}
-  s.description = %q{Common way to manage webserver (apache) configuration using capistrano}
-  s.email = %q{shawn@dasho.net}
-  s.extra_rdoc_files = ["README.rdoc", "lib/webserver/apache.rb"]
-  s.files = ["README.rdoc", "Rakefile", "capistrano-webserver.gemspec", "lib/webserver/apache.rb", "Manifest"]
-  s.homepage = %q{http://github.com/dashonet/capistrano-webserver}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Capistrano-webserver", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{capistrano-webserver}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Common way to manage webserver configuration using capistrano. Only apache is currently supported.}
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<capistrano>, [">= 0"])
-    else
-      s.add_dependency(%q<capistrano>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<capistrano>, [">= 0"])
-  end
+  gem.add_dependency "capistrano", "~> 2.13.0"
 end

data/lib/capistrano-webserver.rb

@@ -0,0 +1,2 @@
+require "capistrano/webserver"
+

data/lib/capistrano/webserver.rb

@@ -0,0 +1 @@
+require "capistrano/webserver/version"

data/lib/{webserver → capistrano/webserver}/apache.rb

@@ -1,8 +1,8 @@
 Capistrano::Configuration.instance(true).load do
-
   ## common variables
   set :webserver_link,    true
   set :webserver_config,  "config/webserver/webserver.conf"
+  set :webserver_application, application
   set :webserver_restart, true
 
   ## apache specific variables
@@ -34,16 +34,16 @@ Capistrano::Configuration.instance(true).load do
     DESC
     task :configuration, :roles => :web do
       # upload the file
-      upload "#{webserver_config}", "#{shared_path}/webserver/#{application}"
-      
+      upload "#{webserver_config}", "#{shared_path}/webserver/#{webserver_application}"
+
       # remove the old file / link
-      run "sudo rm -f #{webserver_dir}/#{application}"
-      
+      run "sudo rm -f #{webserver_dir}/#{webserver_application}"
+
       # link or copy file from shared to webserver directory
       if webserver_link == true
-        run "sudo ln -sf #{shared_path}/webserver/#{application} #{webserver_dir}/#{application}"
+        run "sudo ln -sf #{shared_path}/webserver/#{webserver_application} #{webserver_dir}/#{webserver_application}"
       else
-        run "sudo cp #{shared_path}/webserver/#{application} #{webserver_dir}/#{application}"
+        run "sudo cp #{shared_path}/webserver/#{webserver_application} #{webserver_dir}/#{webserver_application}"
       end
 
       # restart the webserver
@@ -68,4 +68,4 @@ Capistrano::Configuration.instance(true).load do
     end
 
   end
-end
+end

data/lib/capistrano/webserver/version.rb

@@ -0,0 +1,5 @@
+module Capistrano
+  module Webserver
+    VERSION = "0.2.1"
+  end
+end

metadata

@@ -1,91 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capistrano-webserver
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
 platform: ruby
-authors: 
+authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-17 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.13.0
 description: Common way to manage webserver (apache) configuration using capistrano
-email: shawn@dasho.net
+email:
+- me@shawncatz.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
-- lib/webserver/apache.rb
-files: 
-- README.rdoc
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
+- README.md
 - Rakefile
 - capistrano-webserver.gemspec
-- lib/webserver/apache.rb
-- Manifest
-has_rdoc: true
-homepage: http://github.com/dashonet/capistrano-webserver
+- lib/capistrano-webserver.rb
+- lib/capistrano/webserver.rb
+- lib/capistrano/webserver/apache.rb
+- lib/capistrano/webserver/version.rb
+homepage: http://github.com/shawncatz/capistrano-webserver
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Capistrano-webserver
-- --main
-- README.rdoc
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: capistrano-webserver
-rubygems_version: 1.6.2
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Common way to manage webserver configuration using capistrano. Only apache is currently supported.
+summary: Common way to manage webserver (apache) configuration using capistrano
 test_files: []
-

data/Manifest

@@ -1,5 +0,0 @@
-README.rdoc
-Rakefile
-capistrano-webserver.gemspec
-lib/webserver/apache.rb
-Manifest

data/README.rdoc

@@ -1,63 +0,0 @@
-= Capistrano WebServer 
-
-The purpose of this gem is to provide a common interface to handling webserver related functions within capistrano deploy scripts.
-The contents of this file are still a bit of a work in progress.
-
-= Server Support
-
-Currently, only apache is supported.
-
-= Configuration
-
-== Common variables
-
-[webserver_config]	<b>default: config/webserver/webserver.conf</b>
-			the file to use for webserver configuration. For apache, this might be the file
-			containing the VirtualHost block of the site in which the project
-			will be running.
-[webserver_link]	<b>default: true</b>
-			Use a symlink from the webserver configuration directory to the project configuration file.
-			If this is set to false, the file will be copied to the webserver configuration directory.
-[webserver_restart]	<b>default: true</b>
-			Should the webserver be restarted after configuration is updated.
-
-== Module variables
-
-[webserver_dir]		This is defined by the capistrano_webserver modules. For apache, this would generally point to
-			sites-enabled directory under the ServerRoot. (eg: /etc/apache2/sites-enabled)
-
-= Tasks
-
-Each webserver library will implement the following capistrano tasks. These tasks will only run on servers with the :web role.
-
-== webserver:configuration
-
-This task will handle linking or copying the configuration file from the project directory to the webserver directory.
-
-== webserver:restart
-
-This task will restart the webserver.
-
-== webserver:stop
-
-This task will stop the webserver.
-
-== webserver:start
-
-This task will start the webserver.
-
-= Usage
-
-Install the gem:
-
-	gem install capistrano-webserver
-
-Put the following code into your capistrano deploy.rb (or other) file. For now, only apache is supported. Later, support for other webservers will be added.
-
-	require 'webserver/apache'
-
-If your configuration or webserver requires a restart after code deploy, simply add the following hook. This will work by default, careful of overriding the variable 'webserver_restart'.
-
-	after 'deploy:update_code', 'webserver:configuration'
-
-In the case of Apache, you do not need this. You should not need to restart the Apache server after every deploy.