laravel 0.1.0 → 0.1.1

data/features/new.feature

@@ -38,4 +38,13 @@ Feature: Laravel 'new'
     When  I run `laravel new my_app --remote=http://github.com/github/gitignore`
     Then  local cache for "non_laravel" repository should not be created
     And   the stdout should contain "source is corrupt"
+    And   the stdout should contain "ERROR"
     And   laravel application must not be created inside "my_app" directory
+
+  @may_require_repository_download
+  Scenario: create Laravel application in the current directory
+    When  I run `laravel new . --force`
+    Then  the stdout should contain "Hurray!"
+    And   laravel application must be created inside current directory
+    When  I run `laravel new .`
+    Then  the stdout should contain "ERROR"

data/features/step_definitions/new.rb

@@ -9,6 +9,11 @@ Then /^laravel application must not be created inside "(.*?)" directory$/ do |di
   !File.exists?(dir)
 end
 
+Then /^laravel application must be created inside current directory$/ do
+  dir = File.expand_path(Dir.pwd)
+  Laravel::has_laravel?(dir)
+end
+
 Then /^local cache for "(.*?)" repository should not be created$/ do |repo|
   repo = get_test_repo_path(repo)
   !File.exists?(repo)

data/features/support/env.rb

@@ -1,6 +1,13 @@
 require "aruba/cucumber"
 require "laravel"
 
+After do
+  test_directory = File.expand_path(File.join(File.dirname(__FILE__), %w[ .. .. tmp aruba]))
+  FileUtils.rm_rf(File.join(test_directory, "my_app"))
+  FileUtils.rm_rf(File.join(test_directory, "laravel"))
+  FileUtils.rm_rf(File.join(test_directory, "current"))
+end
+
 Before('@very_slow') do
   @aruba_timeout_seconds = 300
 end
@@ -16,8 +23,3 @@ end
 Before('@slow') do
   @aruba_timeout_seconds = 60
 end
-
-After do
-  FileUtils.rm_rf(File.join(%w[ tmp aruba my_app]))
-  FileUtils.rm_rf(File.join(%w[ tmp aruba laravel]))
-end

data/features/support/laravel_helpers.rb

@@ -1,6 +1,5 @@
 module LaravelHelpers
-  # this is what `aruba` changes directory to, when testing
-  TestDirectory = File.expand_path(File.join(%w[ tmp aruba]))
+  TestDirectory = File.expand_path(File.join(File.dirname(__FILE__), %w[ .. .. tmp aruba]))
 
   def get_relative_path_to_test_directory(dir, relative_to = nil)
     relative_to = TestDirectory unless relative_to

data/lib/laravel/create.rb

@@ -14,26 +14,34 @@ module Laravel
     #   - string containing error message, if any or is otherwise nil
     #
     def self.source(path, options = {})
+      # get some information about this path
+      path = File.expand_path(path)
+      is_current_dir = (path == File.expand_path('.'))
+      is_not_empty   = (Dir.entries(path).size > 2) if File.exists?(path)
 
       # make sure that the path does not already exists (no overwrites!)
-      if File.exists?(path) and not options[:force]
-        Laravel::say_error "directory already exists!"
+      if ((File.exists?(path) and not is_current_dir) or (is_current_dir and is_not_empty)) and not options[:force]
+        Laravel::say_error "directory already exists or is not empty!"
       end
 
       # delete the existing files, if we are forced for this
       if options[:force]
         Laravel::say_info "Creating application forcefully!"
-        FileUtils.rm_rf path
+        is_current_dir ? FileUtils.rm_rf("#{path}/.", :secure => true) : FileUtils.rm_rf(path)
       end
 
       # create the requisite directory structure
-      FileUtils.mkdir_p File.dirname(path)
+      FileUtils.mkdir_p File.dirname(path) unless is_current_dir
 
       # download/update local repository as required
       local_repo_for_remote_path = options[:local] || self.local_repository(options)
 
       # copy the Laravel source to the required path
-      FileUtils.cp_r local_repo_for_remote_path, path
+      if is_current_dir
+        FileUtils.cp_r "#{local_repo_for_remote_path}/.", path
+      else
+        FileUtils.cp_r local_repo_for_remote_path, path
+      end
 
       # make necessary changes for the new app, if we were successful in download
       # otherwise, remove the downloaded source
@@ -44,7 +52,7 @@ module Laravel
       else
         Laravel::say_failed "Downloaded source is not Laravel framework or a possible fork."
         Laravel::say_info "Cleaning up.."
-        FileUtils.rm_rf "#{path}"
+        FileUtils.rm_rf "#{path}" unless is_current_dir
         # delete_corrupted = Laravel::yes? "Should I delete the specified repository from local cache? (default: yes)"
         # if delete_corrupted
           # Laravel::say_info "Deleting local cache for this source!"

data/lib/laravel/version.rb

@@ -1,3 +1,3 @@
 module Laravel
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: laravel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: