negroku 2.4.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90b0dd4913acc2b6bd2a667860a768f333b15e7b
-  data.tar.gz: dedf7fc1f40a0ae5d4dcf04efbe5041428de355a
+  metadata.gz: 5dcb77d7922f3f0294a836a8995476b009898fa2
+  data.tar.gz: 2162463bb26561d51e152dc47f90ae58fe5b6ca8
 SHA512:
-  metadata.gz: 1e88de7c39d95d51ab839f3b21939f2c73289c5bab317bac921ed5faca8c2092f956fb3793914202dee0ba8e582302afd3b2352939473354d74af6a40e8177b0
-  data.tar.gz: 3806015f329ad0489cd38af8e55664b7fbd0953c8bd781244750a4532b49871a1d9e32f5d53c78c26d4be0cd4492c82051beeae7bfd307fc093007728dbe5ba7
+  metadata.gz: f158341dcc67274203b30f9f749f8fc4bb82b2763171772a4afc2b5fbfd217d6b584ce8c0b851b61145a2dd8234a9b681cb0dbf9f6a28dba79167cf7baaf9523
+  data.tar.gz: 9fd78397e37a89241b39619b3037a8415de29848fc4485524853dc1ed4dad1cd6a3f628029d8971be947d63a1cfeb51d50bec575dab2bdfbe586bbf386520d8a

data/.travis.yml

@@ -2,6 +2,8 @@
 language: ruby
 script: bundle exec rspec spec
 rvm:
+  - "1.9.3"
   - "2.0.0"
   - "2.1.0"
+  - "2.2.0"
 sudo: false

data/lib/negroku.rb

@@ -1,5 +1,18 @@
 require 'negroku/i18n'
 require 'negroku/version'
+require 'negroku/versionable'
+
+module Negroku
+  include Negroku::Versionable
+
+  def self.version
+    VERSION
+  end
+
+  def self.capfile_version
+    defined?(::CAPFILE_VERSION).nil? ? "0.0.0" : ::CAPFILE_VERSION
+  end
+end
 
 # Add requires for other files you add to your project here, so
 # you just need to require this one file in your bin file

data/lib/negroku/{deploy.rb → capistrano/deploy.rb}

@@ -1,4 +1,4 @@
-require 'negroku/helpers'
+require 'negroku/helpers/tasks'
 
 # Base configuration
 namespace :load do
@@ -21,7 +21,6 @@ namespace :load do
 end
 
 # Load Negroku tasks
-load_task "negroku"
 load_task "env"
 load_task "rbenv"             if required? 'capistrano/rbenv'
 load_task "nodenv"            if required? 'capistrano/nodenv'

data/lib/negroku/{tasks → capistrano/tasks}/eye.rake

@@ -78,7 +78,7 @@ namespace :negroku do
 
           # use a build in template if the template doesn't exists in the project
           unless File.exists?(template_path)
-            template_path = "tasks/eye/application.eye.erb"
+            template_path = "capistrano/templates/eye/application.eye.erb"
           end
 
           config = build_template(template_path, nil, binding)

data/lib/negroku/{tasks → capistrano/tasks}/thinking_sphinx.rake

@@ -37,7 +37,7 @@ namespace :negroku do
 
           # user a build in template if the template doesn't exists in the project
           unless File.exists?(template_path)
-            template_path = "tasks/thinking_sphinx.yml.erb"
+            template_path = "capistrano/templates/thinking_sphinx.yml.erb"
           end
 
           config = build_template(template_path, nil, binding)

data/lib/negroku/{tasks → capistrano/tasks}/unicorn.rake

@@ -70,7 +70,7 @@ namespace :negroku do
 
           # user a build in template if the template doesn't exists in the project
           unless File.exists?(template_path)
-            template_path = "tasks/unicorn_#{fetch(:unicorn_template_type)}.rb.erb"
+            template_path = "capistrano/templates/unicorn_#{fetch(:unicorn_template_type)}.rb.erb"
           end
 
           config = build_template(template_path, nil, binding)

data/lib/negroku/capistrano/update.rb

@@ -0,0 +1,3 @@
+require 'negroku/modes/app'
+
+Negroku::Modes::App.check_all_versions

data/lib/negroku/cli.rb

@@ -1,6 +1,8 @@
 require 'capistrano/all'
 require 'capistrano/setup'
 require 'capistrano/deploy'
+require 'bundler'
+require 'virtus'
 
 # Load applications deploy config if it exists
 require './config/deploy' if File.exists? "./config/deploy.rb"
@@ -9,15 +11,16 @@ require 'gli'
 require 'inquirer'
 require 'negroku/i18n'
 require 'negroku/version'
-require 'negroku/cli/bootstrap'
-require 'negroku/cli/stage'
-require 'negroku/cli/env'
+require 'negroku/versionable'
+require 'negroku/config'
+require 'negroku/modes/app'
+require 'negroku/modes/stage'
+require 'negroku/modes/env'
 require 'negroku/helpers/app_directory'
 require 'negroku/helpers/templates'
 
 require 'capistrano/rbenv'
-require 'negroku/deploy'
-
+require 'negroku/capistrano/deploy'
 
 module Negroku::CLI
 

data/lib/negroku/cli/commands/app.rb

@@ -7,7 +7,16 @@ module Negroku::CLI
     app.command :create do |create|
       create.action do |global_options,options,args|
 
-        Negroku::Bootstrap.install
+        Negroku::Modes::App.install
+
+      end
+    end
+
+    app.desc 'Update your negroku capfile'
+    app.command :update do |create|
+      create.action do |global_options,options,args|
+
+        Negroku::Modes::App.update
 
       end
     end

data/lib/negroku/cli/commands/env.rb

@@ -6,7 +6,7 @@ module Negroku::CLI
     app.desc 'Sets multiple variables from rbenv-vars to a server'
     app.command :bulk do |bulk|
       bulk.action do |global_options,options,args|
-        Negroku::Env.bulk
+        Negroku::Modes::Env.bulk
       end
     end
 

data/lib/negroku/cli/commands/stage.rb

@@ -7,7 +7,7 @@ module Negroku::CLI
     stage.command :add do |add|
       add.action do |global_options,options,args|
 
-        Negroku::Stage.add
+        Negroku::Modes::Stage.add
 
       end
     end

data/lib/negroku/config.rb

@@ -0,0 +1,64 @@
+module Negroku
+  class Feature
+    include Virtus.value_object
+
+    values do
+      attribute :name, String
+      attribute :required, Boolean, default: false
+      attribute :enabled, Boolean, default: false, :writer => :public
+    end
+  end
+end
+
+class Negroku::ConfigFactory
+  include Virtus.model
+
+  def self.loaded_in_bundler(name)
+    Bundler.load.dependencies.any? {|a| a.name == name}
+  end
+
+  attribute :bower, Negroku::Feature, default: {
+    name: "bower", enabled: File.exists?('bower.json')
+  }
+
+  attribute :bundler, Negroku::Feature, default: {
+    name: "bundler", enabled: File.exists?('Gemfile')
+  }
+
+  attribute :delayed_job, Negroku::Feature, default: {
+    name: "delayed_job", enabled: loaded_in_bundler('delayed_jobs')
+  }
+
+  attribute :nginx, Negroku::Feature, default: {
+    name: "nginx", enabled: true, required: true
+  }
+
+  attribute :nodenv, Negroku::Feature, default: {
+    name: "nodenv", enabled: true, required: true
+  }
+
+  attribute :rails, Negroku::Feature, default: {
+    name: "rails", enabled: loaded_in_bundler('rails')
+  }
+
+  attribute :rbenv, Negroku::Feature, default: {
+    name: "rbenv", enabled: true, required: true
+  }
+
+  attribute :sphinx, Negroku::Feature, default: {
+    name: "sphinx", enabled: loaded_in_bundler('thinking-sphinx')
+  }
+
+  attribute :unicorn, Negroku::Feature, default: {
+    name: "unicorn", enabled: loaded_in_bundler('unicorn')
+  }
+
+  attribute :whenever, Negroku::Feature, default: {
+    name: "whenever", enabled: loaded_in_bundler('whenever')
+  }
+
+  # private
+
+end
+
+Negroku::Config = Negroku::ConfigFactory.new

data/lib/negroku/helpers.rb

@@ -2,25 +2,4 @@ require 'negroku/helpers/templates'
 require 'negroku/helpers/watch'
 require 'negroku/helpers/logs'
 require 'negroku/helpers/env'
-
-# Find out if a specific library file was already required
-def required?(file)
-  rex = Regexp.new("/#{Regexp.quote(file)}\.(so|o|sl|rb)?")
-  $LOADED_FEATURES.find { |f| f =~ rex }
-end
-
-def any_required?(arr)
-  arr.any? { |file| required?(file) }
-end
-
-def all_required?(arr)
-  arr.all? { |file| required?(file) }
-end
-
-def load_task(name, dependencies = [])
-  if all_required? dependencies
-    load File.join(File.dirname(__FILE__), 'tasks', "#{name}.rake")
-  else
-    fail "To load #{name} you need to include #{dependencies.join ", "}"
-  end
-end
+require 'negroku/helpers/tasks'

data/lib/negroku/helpers/tasks.rb

@@ -0,0 +1,21 @@
+# Find out if a specific library file was already required
+def required?(file)
+  rex = Regexp.new("/#{Regexp.quote(file)}\.(so|o|sl|rb)?")
+  $LOADED_FEATURES.find { |f| f =~ rex }
+end
+
+def any_required?(arr)
+  arr.any? { |file| required?(file) }
+end
+
+def all_required?(arr)
+  arr.all? { |file| required?(file) }
+end
+
+def load_task(name, dependencies = [])
+  if all_required? dependencies
+    load File.join(File.dirname(__FILE__), '..', 'capistrano', 'tasks', "#{name}.rake")
+  else
+    fail "To load #{name} you need to include #{dependencies.join ", "}"
+  end
+end

data/lib/negroku/helpers/templates.rb

@@ -11,8 +11,6 @@ def build_template(template, destination, binding)
     File.open(destination.to_s, 'w+') do |f|
       f.write(result)
     end
-
-    puts I18n.t(:written_file, scope: :negroku, file: destination)
   else
     return StringIO.new(result)
   end
@@ -29,7 +27,7 @@ def get_template_file(filename)
   if File.exists?(filename)
     templateFile = filename
   else
-    templateFile = File.expand_path("../../templates/#{filename}", __FILE__)
+    templateFile = File.expand_path("../../#{filename}", __FILE__)
   end
 
   File.read(templateFile)

data/lib/negroku/helpers/watch.rb

@@ -6,7 +6,7 @@ def watch_process(name, options = {})
   options[:template] ||= name.to_sym
 
   if options[:template].kind_of?(Symbol)
-    options[:template] = "tasks/eye/_#{options[:template]}.erb"
+    options[:template] = "capistrano/templates/eye/_#{options[:template]}.erb"
   end
 
   processes[name] = options

data/lib/negroku/locales/en.yml

@@ -17,3 +17,18 @@ en:
     ask_domains:                  "Type the domains to use"
     ask_server_url:               "Type the server url to deploy to"
     ask_set_vars:                 "Do you want to set rbenv-vars to the server now?"
+    application_features:         "What features do you want to enable?"
+    updating_capfile:              "Updating application Capfile...."
+    updated_capfile:               "The Capfile was updated"
+    no_change_capfile:             "Nothing to update "
+    gem_up_to_date:                "\u2713 Negroku is up to date"
+    capfile_up_to_date:            "\u2713 Your Capfile is up to date"
+    gem_new_version:               "There is a new version of negroku\n"
+    capfile_new_version:           "\u2718 Your Capfile version doesn't match your negroku version\n"
+    gem_latest_version:            "Latest negroku version: %{version}\n"
+    gem_current_version:           "Your negroku version: %{version}\n"
+    capfile_current_version:       "Your Capfile version: %{version}\n"
+    continue_without_update:       "Do you want to continue without updating?"
+    capfile_ask_update:            "Capfile might be out-dated, the current negroku version might have added new features to your Capfile,\ndo you want to continue without update your Capfile?"
+    gem_update_instructions:       "To update just change your %{gemfile} with the latest version and run %{cmd}"
+    capfile_update_instructions:   "To update your %{capfile} just run %{cmd}"

data/lib/negroku/modes/app.rb

@@ -0,0 +1,167 @@
+require 'inquirer'
+require 'colorize'
+require 'negroku'
+
+module Negroku::Modes
+  module App
+    def install
+
+      check_version
+
+      data = {}
+      data[:application_name] = ask_name
+      data[:repo_url] = select_repo
+
+      ask_features
+
+      custom_capify data
+
+    end
+
+    def update
+
+      puts I18n.t :updating_capfile, scope: :negroku
+
+      capfilePath = AppDirectory.root.join('Capfile')
+      capfile = File.read(capfilePath)
+
+      build_capfile
+
+      capfile_new = File.read(capfilePath)
+
+      if capfile_new != capfile
+        puts I18n.t :updated_capfile, scope: :negroku
+      else
+        puts I18n.t :no_change_capfile, scope: :negroku
+      end
+
+    end
+
+    # This code was exatracted from capistrano to be used with our own templates
+    # https://github.com/capistrano/capistrano/blob/68e7632c5f16823a09c324d556a208e096abee62/lib/capistrano/tasks/install.rake
+    def custom_capify(data={}, config=nil)
+      # defaults
+      data[:server_url] = ""
+      data[:branch] = "master"
+
+      FileUtils.mkdir_p AppDirectory.deploy
+
+      build_capfile
+
+      deploy_rb = AppDirectory.config.join('deploy.rb')
+      build_template("templates/deploy.rb.erb", deploy_rb, binding)
+
+      FileUtils.mkdir_p AppDirectory.tasks
+
+      puts I18n.t :capified, scope: :negroku
+
+    end
+
+    def build_capfile
+      # Default Config
+      config ||= Negroku::Config
+
+      capfile = AppDirectory.root.join('Capfile')
+      build_template('templates/Capfile.erb', capfile, binding)
+    end
+
+    # Ask the application name
+    def ask_name
+      question = I18n.t :application_name, scope: :negroku
+      Ask.input question, default: File.basename(Dir.getwd)
+    end
+
+    def ask_features
+      optional_features = Negroku::Config::attributes.select{|k,v| !v.required?}
+      default_features = optional_features.map{|k,v| v.enabled?}
+      features_names = optional_features.map{|k,v| v.name}
+
+      question = I18n.t :application_features, scope: :negroku
+      selected = Ask.checkbox question, features_names, default: default_features
+
+      optional_features.each.with_index do |(idx, feat), index|
+        Negroku::Config[feat.name].enabled = selected[index]
+      end
+    end
+
+    # Get git remotes from current git and ask to select one
+    def select_repo
+      remote_urls = %x(git remote -v 2> /dev/null | awk '{print $2}' | uniq).split("\n")
+      remote_urls << (I18n.t :other, scope: :negroku)
+
+      question = I18n.t :choose_repo_url, scope: :negroku
+      selected_idx = Ask.list question, remote_urls
+
+      if selected_idx == remote_urls.length - 1
+        question = I18n.t :type_repo_url, scope: :negroku
+        Ask.input question
+      else remote_urls[selected_idx] end
+    end
+
+
+    def check_version
+      updated = Negroku.check_version
+
+      if(updated)
+        puts I18n.t(:gem_up_to_date, scope: :negroku).colorize(:green)
+      else
+
+        puts I18n.t(:gem_new_version, scope: :negroku).colorize(:yellow)
+
+        puts I18n.t(:gem_latest_version, scope: :negroku, version: Negroku.latest.colorize(:green))
+        puts I18n.t(:gem_current_version, scope: :negroku, version: Negroku.version.colorize(:yellow))
+
+        puts "\n"
+
+        gemfile_str = "Gemfile".colorize(mode: :bold)
+        cmd_str = "bundle install".colorize(mode: :bold)
+        puts I18n.t(:gem_update_instructions, scope: :negroku, gemfile: gemfile_str, cmd: cmd_str)
+
+        puts "\n"
+
+        question = I18n.t(:continue_without_update, scope: :negroku)
+        continue = ::Ask.confirm(question, default: true)
+
+        exit 0 unless(continue)
+
+        return continue
+      end
+    end
+
+    def check_capfile_version
+      updated = Negroku.check_capfile_version
+
+      if(updated)
+        puts I18n.t(:capfile_up_to_date, scope: :negroku).colorize(:green)
+      else
+        puts I18n.t(:capfile_new_version, scope: :negroku).colorize(:red)
+
+        puts I18n.t(:gem_current_version, scope: :negroku, version: Negroku.version.colorize(:green))
+        puts I18n.t(:capfile_current_version, scope: :negroku, version: Negroku.capfile_version.colorize(:red))
+
+        puts "\n"
+
+        capfile_str = "Capfile".colorize(mode: :bold)
+        cmd_str = "negroku app update".colorize(mode: :bold)
+        puts I18n.t(:capfile_update_instructions, scope: :negroku, capfile: capfile_str, cmd: cmd_str)
+
+        puts "\n"
+
+        question = I18n.t(:continue_without_update, scope: :negroku)
+        continue = ::Ask.confirm(question, default: false)
+
+        exit 0 unless(continue)
+      end
+    end
+
+    def check_all_versions
+      continue = self.check_version
+
+      unless(continue)
+        self.check_capfile_version
+      end
+    end
+
+    extend self
+  end
+end