mina-nginx 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1524f73b74a9fcd393dde060743a323b917754f
-  data.tar.gz: 3063f7a458deb75d6bab43a07699592fdba635c3
+  metadata.gz: 7fc9f55e13f8c93e65915450dba5af5b713a835f
+  data.tar.gz: 3ceb413fd582ed68e31e3d50854f2a14f3ae6f5b
 SHA512:
-  metadata.gz: 41b1f6e05ab72567afa57a0cc8c9fbf8da51da0e5a54d28601feed109a3e8bf869bb0a1bf6841e9e35d1ae2f57a6ce1bc27cabc46efc5aa98f5b692e496120be
-  data.tar.gz: 4e03f71ee33dc85da1471ea1f868ccd2ada2a87159f011de3d2c9f918c296548087a32002d06f6004c642ae136aaa739f59dfcb687bd42f7fcd0a046f7e95771
+  metadata.gz: 925707213e89e846e632c363ec2572cf53e25f2604019324a7de1a83499275fb1e5a5428edf7d8767bcd8d92c5094b91f2516b05ef87f210b906eb428f76f889
+  data.tar.gz: 0405cf368b7f6ade3a12667a6d0655b6d408585c7594dedc1814d93ac6fa9868dd51249a122fb5d6758fae864ecfb944b68672ee7791c301a49c3c5bb60025ba

data/README.md

@@ -34,7 +34,7 @@ Add this to your `config/deploy.rb` file:
 
     require 'mina/nginx'
 
-Make sure the following settings are setted in your `config/deploy.rb`:
+Make sure the following settings are set in your `config/deploy.rb`:
 
 * `application` - application name
 * `server_name` - your application's server_name in nginx (e.g. example.com)(optional)
@@ -47,10 +47,9 @@ $ mina nginx:setup
 $ mina nginx:link
 ```
 
-Be sure to edit `shared/config/nginx.conf` on your server. Or you can parse an sample
-configuration file by `mina nginx:parse` on your server.
+You can parse an sample configuration file by `mina nginx:parse` on your server.
 
-Then:
+Be sure to edit `shared/config/nginx.conf`, and then:
 
 ```
 $ mina nginx:reload
@@ -58,7 +57,7 @@ $ mina nginx:reload
 
 ## Contributing
 
-1. Fork it ( http://github.com/<my-github-username>/mina-nginx/fork )
+1. Fork it ( http://github.com/hbin/mina-nginx/fork )
 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`)

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/lib/mina/nginx.rb

@@ -1,44 +1,44 @@
-require "mina/nginx/version"
+require 'mina/nginx/version'
 
 namespace :nginx do
-  set_default :nginx_user,     "www-data"
-  set_default :nginx_group,    "www-data"
-  set_default :nginx_path,     "/etc/nginx"
-  set_default :nginx_config,   -> { "#{deploy_to}/#{shared_path}/config/nginx.conf" }
-  set_default :nginx_config_e, -> { "#{nginx_path}/sites-enabled/#{application}.conf" }
+  set :nginx_user,     'www-data'
+  set :nginx_group,    'www-data'
+  set :nginx_path,     '/etc/nginx'
+  set :nginx_config,   -> { "#{fetch(:shared_path)}/config/nginx.conf" }
+  set :nginx_config_e, -> { "#{fetch(:nginx_path)}/sites-enabled/#{application}.conf" }
 
   desc 'Setup Nginx'
   task :setup => :environment do
-    queue  %(echo "-----> Setup the nginx")
-    queue! %(touch #{nginx_config})
-    queue  %(echo "-----> Be sure to edit 'shared/config/nginx.conf'.")
+    command %(Setup the nginx)
+    command %(touch #{fetch(:nginx_config)})
+    comment %(Be sure to edit 'shared/config/nginx.conf'.)
   end
 
   desc 'Symlinking nginx config file'
   task :link => :environment do
-    queue  %(echo "-----> Symlinking nginx config file")
-    queue! %(sudo ln -nfs "#{nginx_config}" "#{nginx_config_e}")
+    comment %(Symlinking nginx config file)
+    command %(sudo ln -nfs "#{fetch(:nginx_config)}" "#{fetch(:nginx_config_e)}")
   end
 
   desc 'Parse nginx configuration file and upload it to the server.'
   task :parse => :environment do
     content = erb(nginx_template)
-    queue %(echo '#{content}' > #{nginx_config})
-    queue %(cat #{nginx_config})
-    queue %(echo "-----> Be sure to edit 'shared/config/nginx.conf'.")
+    command %(echo '#{content}' > #{fetch(:nginx_config)})
+    command %(cat #{fetch(:nginx_config)})
+    comment %(Be sure to edit 'shared/config/nginx.conf'.)
   end
 
   %w(stop start restart reload status).each do |action|
     desc "#{action.capitalize} Nginx"
     task action.to_sym => :environment do
-      queue  %(echo "-----> #{action.capitalize} Nginx")
-      queue! "sudo service nginx #{action}"
+      comment %(#{action.capitalize} Nginx)
+      command "sudo service nginx #{action}"
     end
   end
 
   private
 
-    def nginx_template
-      File.expand_path('../templates/nginx.conf.erb', __FILE__)
-    end
+  def nginx_template
+    File.expand_path('../templates/nginx.conf.erb', __FILE__)
+  end
 end

data/lib/mina/nginx/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Nginx
-    VERSION = "0.0.1"
+    VERSION = '0.0.2'.freeze
   end
 end

data/mina-nginx.gemspec

@@ -4,22 +4,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mina/nginx/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "mina-nginx"
+  spec.name          = 'mina-nginx'
   spec.version       = Mina::Nginx::VERSION
-  spec.authors       = ["hbin"]
-  spec.email         = ["huangbin88@foxmail.com"]
-  spec.summary       = %q{Mina tasks for handle with Nginx.}
-  spec.description   = %q{Configuration and managements Mina tasks for Nginx.}
-  spec.homepage      = "https://github.com/hbin/mina-nginx.git"
-  spec.license       = "MIT"
+  spec.authors       = ['hbin']
+  spec.email         = ['huangbin88@foxmail.com']
+  spec.summary       = %(Mina tasks for handle with Nginx.)
+  spec.description   = %(Configuration and managements Mina tasks for Nginx.)
+  spec.homepage      = 'https://github.com/hbin/mina-nginx.git'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($RS)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "mina", "~> 0"
+  spec.add_dependency 'mina', '~> 1'
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rake', '~> 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-nginx
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - hbin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -42,14 +42,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Configuration and managements Mina tasks for Nginx.
@@ -88,9 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Mina tasks for handle with Nginx.
 test_files: []
-has_rdoc: