negroku 2.0.0.pre2 → 2.0.0.pre3

data/lib/negroku/templates/negroku/deploy.rb.erb

@@ -20,13 +20,11 @@ set :application,   '<%= data[:application_name] %>'
 set :repo_url,      '<%= data[:repo_url] %>'
 set :deploy_to,     "/home/deploy/applications/#{fetch(:application)}"
 
-linked_files = Set.new(fetch(:linked_files, [])) # https://github.com/capistrano/rails/issues/52
-linked_files.merge(%w{caca})
-set :linked_files, linked_files.to_a
+# Default value for :linked_files is []
+# set :linked_files, fetch(:linked_files, []) + %w{}
 
-linked_dirs = Set.new(fetch(:linked_dirs, [])) # https://github.com/capistrano/rails/issues/52
-linked_dirs.merge(%w{bin log tmp/pids tmp/cache tmp/sockets public/system})
-set :linked_dirs, linked_dirs.to_a
+# Default value for linked_dirs is []
+# set :linked_dirs, fetch(:linked_dirs, []) + %w{bin log tmp/pids tmp/cache tmp/sockets public/system}
 
 ######################
 # Unicorn
@@ -40,8 +38,3 @@ set :linked_dirs, linked_dirs.to_a
 # set :unicorn_template_type, "rails_activerecord"
 # set :unicorn_workers, 1
 # set :unicorn_workers_timeout, 30
-
-
-
-
-

data/lib/negroku/templates/negroku/stage.rb.erb

@@ -1,13 +1,13 @@
-# <%= stage.upcase %> CONFIGURATION
+# <%= data[:stage_name].upcase %> CONFIGURATION
 
 # Servers and their roles.
-server '<%= data[:staging_server] %>', user: 'deploy', roles: %w{web app db}, my_property: :my_value
+server '<%= data[:server_url] %>', user: 'deploy', roles: %w{web app db}, my_property: :my_value
 
 # Web server configuration
-set :nginx_domains, '<%= data[:staging_domains] %>'
+set :nginx_domains, '<%= data[:domains] %>'
 
 # Source
-set :branch,        'production'    # Optional, defaults to master
+set :branch,        '<%= data[:branch] %>'    # Optional, defaults to master
 
 # Rails configuration
 # set :rails_env,   'production'

data/lib/negroku/version.rb

@@ -1,3 +1,3 @@
 module Negroku
-  VERSION = '2.0.0.pre2'
+  VERSION = '2.0.0.pre3'
 end

data/negroku.gemspec

@@ -19,24 +19,25 @@ spec = Gem::Specification.new do |s|
   s.executables << 'negroku'
 
   s.add_development_dependency('rdoc')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('fakefs')
 
-  s.add_runtime_dependency('rake', '~> 10.1.0')
-  s.add_runtime_dependency('capistrano','~> 3.3.0')
-  s.add_runtime_dependency('capistrano-rbenv', '~> 2.0.0')
-  s.add_runtime_dependency('capistrano-rails', '~> 1.1.0')
-  s.add_runtime_dependency('capistrano-bundler', '~> 1.1.0')
-  s.add_runtime_dependency('capistrano-nc', '~> 0.1.0')
+  s.add_runtime_dependency('rake', '~> 10.1')
+  s.add_runtime_dependency('capistrano','~> 3.3.5')
+  s.add_runtime_dependency('capistrano-rbenv', '~> 2.0.2')
+  s.add_runtime_dependency('capistrano-rails', '~> 1.1.2')
+  s.add_runtime_dependency('capistrano-bundler', '~> 1.1.3')
+  s.add_runtime_dependency('capistrano-npm', '~> 1.0.1')
+  s.add_runtime_dependency('capistrano-nc', '~> 0.1.4')
 
   s.add_runtime_dependency('capistrano-nodenv', '~> 1.0.0')
   s.add_runtime_dependency('capistrano-bower', '~> 1.0.0')
-  s.add_runtime_dependency('capistrano3-nginx', '~> 2.0.0')
+  s.add_runtime_dependency('capistrano3-nginx', '~> 2.0.4')
   s.add_runtime_dependency('capistrano3-unicorn', '~> 0.2.1')
-  s.add_runtime_dependency('capistrano3-delayed-job', '~> 1.0.0')
-  s.add_runtime_dependency('capistrano-npm', '~> 1.0.0')
+  s.add_runtime_dependency('capistrano3-delayed-job', '~> 1.2.1')
   s.add_runtime_dependency('whenever', '~> 0.9.4')
 
-  s.add_runtime_dependency('gli','~> 2.12.0')
-  s.add_runtime_dependency('rainbow','~> 2.0.0')
+  s.add_runtime_dependency('gli','~> 2.12.2')
   s.add_runtime_dependency('inquirer','~> 0.2.0')
-  s.add_runtime_dependency('i18n','~> 0.6.0')
+  s.add_runtime_dependency('i18n')
 end

data/spec/lib/cli/bootstrap_spec.rb

@@ -0,0 +1,46 @@
+require "spec_helper"
+
+module Ask;end
+
+describe "bootstrap cli" do
+
+  describe "install cmd" do
+
+    context "bootstrap app" do
+
+      before(:each) do
+        FakeFS::FileSystem.clear
+        FakeFS::FileSystem.clone(File.join('lib','negroku','templates'))
+        FakeFS::FileSystem.clone(File.join('lib','negroku','locales'))
+        FakeFS.activate!
+
+        Dir.mkdir("config")
+        Dir.mkdir("config/deploy")
+
+        expect(Negroku::Bootstrap).to receive(:select_repo).and_return("git.repo.url")
+        expect(Negroku::Bootstrap).to receive(:ask_name).and_return("NewApp")
+
+      end
+
+      after(:each) do
+        FakeFS.deactivate!
+      end
+
+      it "creates the deploy.rb" do
+        Negroku::Bootstrap.install
+
+        expect(File).to exist("config/deploy.rb")
+        content = File.read("config/deploy.rb")
+        expect(content).to match(/set :application,\s+'NewApp'/)
+        expect(content).to match(/set :repo_url,\s+'git.repo.url'/)
+      end
+
+      it "copies the Capfile" do
+        Negroku::Bootstrap.install
+
+        expect(File).to exist("Capfile")
+      end
+
+    end
+  end
+end

data/spec/lib/cli/env_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+module Ask;end
+module Capistrano
+  module Application;end
+end
+
+describe "env cli" do
+  describe "bulk cmd" do
+    before(:each) do
+      FakeFS::FileSystem.clear
+      FakeFS.activate!
+      File.open(".rbenv-vars", "w") do |file|
+        file.puts "#COMMENTED=HI"
+        file.puts "SERVER=platan.us"
+        file.puts "PASSWORD=oops"
+      end
+    end
+
+    after(:each) do
+      FakeFS.deactivate!
+    end
+
+    it "asks for stage if not selected" do
+      expect(Negroku::Env).to receive(:select_stage)
+
+      Negroku::Env.bulk
+    end
+
+    it "use selected stage if passed" do
+      allow(Negroku::Env).to receive(:select_variables).and_return([])
+      expect(Negroku::Env).not_to receive(:select_stage)
+
+      Negroku::Env.bulk "beta"
+    end
+
+    it "selects the stage and calls rbenv:vars:add with the vars" do
+      allow(Negroku::Env).to receive(:select_variables).and_return({USER: "emilio", PASSWORD: "123"})
+      expect(Capistrano::Application).to receive(:invoke).with("beta")
+      expect(Capistrano::Application).to receive(:invoke).with("rbenv:vars:add", "USER=emilio", "PASSWORD=123")
+
+      Negroku::Env.bulk "beta"
+    end
+
+    it "returns the list of variables" do
+      expect{|b| Negroku::Env.get_variables(&b)}.to yield_control.twice
+    end
+  end
+end

data/spec/lib/cli/stage_spec.rb

@@ -0,0 +1,79 @@
+require "spec_helper"
+
+module Ask;end
+
+describe "stage cli" do
+
+  context "add command" do
+
+    it "fails with no stage name defined" do
+      allow(Ask).to receive(:input).and_return("")
+      expect{Negroku::Stage.add}.to raise_error(/required/)
+    end
+
+    it "calls negroku env bulk if chosen" do
+      allow(Negroku::Stage).to receive(:ask_stage).and_return("deleteme")
+      allow(Negroku::Stage).to receive(:select_branch).and_return("master")
+      allow(Negroku::Stage).to receive(:ask_domains).and_return("www")
+      allow(Negroku::Stage).to receive(:ask_server_url).and_return("server_url")
+      allow(Negroku::Stage).to receive(:add_stage_file)
+
+      expect(Negroku::Stage).to receive(:ask_add_vars).and_return(true)
+      expect(Negroku::Env).to receive(:bulk).with("deleteme")
+
+      expect{Negroku::Stage.add}.not_to raise_error
+    end
+
+    it "creates the stage file" do
+      config = {
+        stage_name: "new_stage",
+        branch: "test",
+        domains: "test.platan.us",
+        server_url: "server.url"
+      }
+      FakeFS::FileSystem.clear
+      FakeFS::FileSystem.clone(File.join('lib','negroku','templates'))
+      FakeFS.activate!
+      Dir.mkdir("config")
+      Dir.mkdir("config/deploy")
+
+      Negroku::Stage.add_stage_file(config)
+
+      expect(File).to exist("config/deploy/new_stage.rb")
+      content = File.read("config/deploy/new_stage.rb")
+      expect(content).to match(/NEW_STAGE CONFIGURATION/)
+      expect(content).to match(/server 'server.url'/)
+      expect(content).to match(/set :branch,\s+'test'/)
+      expect(content).to match(/set :nginx_domains,\s+'test.platan.us'/)
+
+      FakeFS.deactivate!
+    end
+
+  end
+
+  context "#get_remote_branches" do
+    it "gets the remote branches" do
+      branches = %q(
+        origin/HEAD -> origin/master
+        origin/master
+        origin/staging
+      )
+      expect(Negroku::Stage).to receive(:`).with('git branch -r').and_return(branches)
+
+      branches = Negroku::Stage.get_remote_branches
+      expect(branches.size).to eq 2
+      expect(branches).to include("master")
+      expect(branches).to include("staging")
+    end
+
+    it "returns an empty array if the command fails" do
+      branches = ""
+      expect(Negroku::Stage).to receive(:`).with('git branch -r').and_return(branches)
+
+      branches = Negroku::Stage.get_remote_branches
+      expect(branches.size).to eq 0
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require 'bundler/setup'
+Bundler.setup
+
+require 'negroku/i18n'
+require 'negroku/cli/bootstrap'
+require 'negroku/cli/stage'
+require 'negroku/cli/env'
+require 'negroku/helpers/app_directory'
+require 'negroku/helpers/templates'
+
+require "fakefs/safe"
+
+RSpec.configure do |config|
+  # some (optional) config here
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: negroku
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
+  version: 2.0.0.pre3
 platform: ruby
 authors:
 - Juan Ignacio Donoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -24,106 +24,134 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '10.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.3.5
 - !ruby/object:Gem::Dependency
   name: capistrano-rbenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: capistrano-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: capistrano-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
-  name: capistrano-nc
+  name: capistrano-npm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: capistrano-nodenv
+  name: capistrano-nc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
-  name: capistrano-bower
+  name: capistrano-nodenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -137,61 +165,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: capistrano3-nginx
+  name: capistrano-bower
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: capistrano3-unicorn
+  name: capistrano3-nginx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
-  name: capistrano3-delayed-job
+  name: capistrano3-unicorn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: capistrano-npm
+  name: capistrano3-delayed-job
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: whenever
   requirement: !ruby/object:Gem::Requirement
@@ -212,28 +240,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: inquirer
   requirement: !ruby/object:Gem::Requirement
@@ -252,16 +266,16 @@ dependencies:
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
 description: Deploy applications right out of the box using nginx, unicorn, bower,
   rails, etc
 email: jidonoso@gmail.com
@@ -273,6 +287,7 @@ extra_rdoc_files:
 - negroku.rdoc
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -283,11 +298,20 @@ files:
 - lib/negroku/cli.rb
 - lib/negroku/cli/bootstrap.rb
 - lib/negroku/cli/commands/app.rb
+- lib/negroku/cli/commands/env.rb
 - lib/negroku/cli/commands/negroku.rb
+- lib/negroku/cli/commands/stage.rb
+- lib/negroku/cli/env.rb
+- lib/negroku/cli/stage.rb
 - lib/negroku/deploy.rb
 - lib/negroku/formatters/simple.rb
 - lib/negroku/helpers.rb
+- lib/negroku/helpers/app_directory.rb
+- lib/negroku/helpers/env.rb
+- lib/negroku/helpers/logs.rb
+- lib/negroku/helpers/templates.rb
 - lib/negroku/i18n.rb
+- lib/negroku/locales/en.yml
 - lib/negroku/tasks/bower.rake
 - lib/negroku/tasks/bundler.rake
 - lib/negroku/tasks/delayed_job.rake
@@ -307,8 +331,10 @@ files:
 - lib/negroku/version.rb
 - negroku.gemspec
 - negroku.rdoc
-- test/default_test.rb
-- test/test_helper.rb
+- spec/lib/cli/bootstrap_spec.rb
+- spec/lib/cli/env_spec.rb
+- spec/lib/cli/stage_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/platanus/negroku
 licenses: []
 metadata: {}

data/test/default_test.rb

@@ -1,14 +0,0 @@
-require 'test_helper'
-
-class DefaultTest < Test::Unit::TestCase
-
-  def setup
-  end
-
-  def teardown
-  end
-
-  def test_the_truth
-    assert true
-  end
-end

data/test/test_helper.rb

@@ -1,9 +0,0 @@
-require 'test/unit'
-
-# Add test libraries you want to use here, e.g. mocha
-
-class Test::Unit::TestCase
-
-  # Add global extensions to the test case class here
-  
-end