laravel 0.1.4 → 0.2.1

data/README.md

@@ -59,7 +59,19 @@ cached!
     laravel new my_app --key
 
     # use default settings but do not update permissions on storage/ directory
-    laravel new my_app --no_perms
+    laravel new my_app --no-perms
+
+    # use default settings and download Laravel Generator by Jeffrey Way
+    laravel new my_app --generator
+
+    # the settings I use:
+    laravel new my_app --key --generator --index=''
+    ## this creates a Laravel application from the official repository,
+    ## sets the Application Index to blank, makes the storage directory
+    ## world-writable, generates a new key for the application and finally
+    ## sets up the :generate tasks by downloading Laravel Generator.
+    ## Furthermore, this creates the local cache for the official repository
+    ## which makes the future installs quite faster :)
 
 ### In an existing Laravel application
 

data/bin/laravel

@@ -30,8 +30,7 @@ module Laravel
     # --force  => overwrite target directory, if it exists
     # --index  => update Application Index for newly created application
     # --key    => generate a new key for this application
-    # --no_perms => do not update permissions on storage/ directory
-    # --bundles => comma-separated list of bundles to install
+    # --[no-]perms => do not update permissions on storage/ directory
     desc "new [MY_APP]", "create a new Laravel application"
     method_option :local,  :type => :string,  :aliases => "-l", :banner => "DIRECTORY",
       :desc => "use laravel source from a local directory"
@@ -42,9 +41,10 @@ module Laravel
       :desc => "change the Application Index"
     method_option :key,    :type => :boolean, :aliases => "-k",
       :desc => "generate a new key for this application"
-    method_option :bundles,:type => :string, :aliases => "-b",
-      :desc => "comma-separated list of bundles to install"
-    method_option :no_perms, :type => :boolean, :desc => "do not update permissions on storage/ directory"
+    method_option :perms, :type => :boolean, :default => true,
+      :desc => "default | update permissions on storage/ directory"
+    method_option :generator, :type => :boolean, :aliases => "-g",
+      :desc => "get the Laravel generator by Jeffrey Way"
     def new(app_name)
       Laravel::Create::source app_name, options
     end
@@ -58,6 +58,8 @@ module Laravel
       Laravel::Manage::update_index new_index, options[:app]
     end
 
+    # allow the user to generate a new key
+    # --app => use the given directory instead of pwd
     desc "generate_key", "generate a new key for Laravel application"
     method_option :app, :type => :string, :aliases => "-a",
       :desc => "use the specified Laravel application instead of current directory"
@@ -65,11 +67,13 @@ module Laravel
       Laravel::Manage::generate_key options[:app]
     end
 
-    desc "install_bundles", "comma-separated list of bundles to install"
+    # allow the user to download the generator from Jeffrey Way
+    # --app => use the given directory instead of pwd
+    desc "get_generator", "download the Laravel Generator by Jeffrey Way"
     method_option :app, :type => :string, :aliases => "-a",
       :desc => "use the specified Laravel application instead of current directory"
-    def install_bundles
-      Laravel::Manage::install_bundles options[:app]
+    def get_generator
+      Laravel::Manage::get_generator options[:app]
     end
 
     # choose a default task to run

data/features/S_1_new.feature

@@ -3,7 +3,7 @@ Feature: Create a new application based on Laravel framework for PHP
   As a PHP developer acquinted with ruby
   I want to use Laravel gem to setup Laravel framework
 
-  @requires_repository_download @very_slow
+  @requires_repository_download @very_slow @online
   Scenario: create Laravel application with default settings
     Given local cache does not exist for "official" repository
     When  I run `laravel new my_app`
@@ -16,13 +16,13 @@ Feature: Create a new application based on Laravel framework for PHP
     When  I run `laravel new .`
     Then  the stdout should contain "ERROR"
 
-  @requires_repository_download
+  @requires_repository_download @online
   Scenario: create Laravel application using source from a non-official repo
     Given local cache does not exist for "pastes" repository
     When  I run `laravel new my_app --remote=http://github.com/laravel/pastes`
     Then  laravel application should be ready to use in "my_app" directory using "pastes" repository
 
-  @requires_repository_download
+  @requires_repository_download @online
   Scenario: create Laravel application using non-laravel repository
     When  I run `laravel new my_app --remote=http://github.com/github/gitignore`
     Then  local cache for "non_laravel" repository should not exist
@@ -44,19 +44,16 @@ Feature: Create a new application based on Laravel framework for PHP
 
   @may_require_repository_download
   Scenario: create Laravel application but do not update permissions on storage/ directory
-    When  I run `laravel new my_app --no_perms`
+    When  I run `laravel new my_app --no-perms`
     Then  the stdout should contain "Hurray!"
     And   laravel application must exist in "my_app" directory
     And   permissions should not be updated on "my_app/storage" directory
 
-  @may_require_repository_download @focus @announce
+  @may_require_repository_download
   Scenario: create Laravel application with maximum customizations
-    When I run `laravel new -ki '' -b=bob,anbu -r http://github.com/laravel/pastes my_app --force`
+    When I run `laravel new -kgi 'home.php' -r http://github.com/laravel/pastes my_app --force`
     Then laravel application should be ready to use in "my_app" directory
-    And  "bob" bundle must be installed for "my_app" application
-    And  "anbu" bundle must be installed for "my_app" application
     And  the stdout should contain "Creating application forcefully"
-    And  the stdout should contain "Generated a new key"
-    And  the stdout should contain "Changed Application Index"
-    And  the stdout should contain "Installed bundle: Bob"
-    And  the stdout should contain "Installed bundle: Anbu"
+    And  application key must be set for "my_app" application
+    And  application index must be set to "home.php" for "my_app" application
+    And  generator tasks should be setup for "my_app" application

data/features/S_2_generate_key.feature

@@ -8,8 +8,7 @@ Feature: Generate a new key for Laravel application
     Given laravel application exists in "my_app" directory
     Then  application key must not be set for "my_app" application
     When  I run `laravel generate_key --app=my_app`
-    Then  the stdout should contain "Generated a new key"
-    And   application key must be set for "my_app" application
+    Then  application key must be set for "my_app" application
 
   @may_require_repository_download
   Scenario: create Laravel application and generate a key for it

data/features/S_3_update_index.feature

@@ -7,8 +7,7 @@ Feature: Update Application Index for a Laravel based application
   Scenario: update Application Index in a Laravel application
     Given laravel application exists in "my_app" directory
     When  I run `laravel update_index 'home.php' --app=my_app`
-    Then  the stdout should contain "Changed Application Index"
-    And   application index must be set to "home.php" for "my_app" application
+    Then  application index must be set to "home.php" for "my_app" application
 
   @may_require_repository_download
   Scenario: create Laravel application without an Application Index

data/features/S_4_generator.feature

@@ -0,0 +1,16 @@
+Feature: Download Laravel Generator by Jeffrey Way
+  In order to generate code for my application quickly using :generate tasks
+  As a PHP developer acquinted with ruby
+  I want to use Laravel gem to download Laravel Generator by Jeffrey Way
+
+  @may_require_repository_download
+  Scenario: download Laravel generator
+    Given laravel application exists in "my_app" directory
+    When  I run `laravel get_generator --app=my_app`
+    Then  generator tasks should be setup for "my_app" application
+
+  @may_require_repository_download
+  Scenario: download Laravel generator while creating an application
+    When  I run `laravel new my_app --generator`
+    Then  laravel application should be ready to use in "my_app" directory
+    And   generator tasks should be setup for "my_app" application

data/features/step_definitions/laravel.rb

@@ -63,6 +63,7 @@ end
 
 # check if valid permissions were set on the "storage/" directory
 Then /^permissions should( not)? be updated on "(.*?)" directory$/ do |negation, dir|
+  step "the stdout should contain \"Updated permissions\"" unless negation
   dir = get_relative_path_to_test_directory(dir)
   world_bit = sprintf("%o", File.stat(dir).mode).to_s[-1,1].to_i
   is_world_writable = [2,3,6,7].include?(world_bit)
@@ -71,11 +72,27 @@ end
 
 # check if application index was set
 Then /^application index must be set to "(.*?)" for "(.*?)" application$/ do |new_index, app_directory|
+  step "the stdout should contain \"Changed Application Index\""
   check_config_file_for_string("'index' => '#{new_index}'", app_directory)
 end
 
 # check if application key was set
 Then /^application key must(| not) be set for "(.*?)" application$/ do |negation, app_directory|
+  step "the stdout should contain \"Generated a new key\"" unless negation
   key_regex = negation.empty? ? "[0-9a-f]{32}" : "YourSecretKeyGoesHere!"
   check_config_file_for_string("'key' => '#{key_regex}'", app_directory)
 end
+
+# check if generator tasks were setup
+Then /^generator tasks should be setup for "(.*?)" application$/ do |dir|
+  step "the stdout should contain \"Downloaded Laravel Generator by Jeffrey Way\""
+  dir = get_relative_path_to_test_directory(dir)
+  generator_tasks_file = File.join(dir, %w[ application tasks generate.php])
+  raise_error_based_on_condition(File.exists?(generator_tasks_file))
+  unless `which php`.empty?
+    artisan = File.join(dir, "artisan")
+    step "I run `php #{artisan} generate`"
+    step "the stdout should contain \"generate\""
+    step "the stdout should not contain \"Sorry\""
+  end
+end

data/lib/laravel/create.rb

@@ -46,9 +46,9 @@ module Laravel
       # make necessary changes for the new app, if we were successful in download
       # otherwise, remove the downloaded source
       if Laravel::has_laravel? path
-        storage_directory = File.join(path, "storage")
         Laravel::say_success "Cloned Laravel repository."
-        unless options.has_key?("no_perms")
+        if options[:perms]
+          storage_directory = File.join(path, "storage")
           response = system("chmod -R o+w #{storage_directory}")
           if response
             Laravel::say_success "Updated permissions on storage/ directory."
@@ -58,6 +58,7 @@ module Laravel
         end
         Laravel::Manage::update_index options[:index], path if options.has_key?("index")
         Laravel::Manage::generate_key path if options.has_key?("key")
+        Laravel::Manage::get_generator path if options.has_key?("generator")
         Laravel::say_success "Hurray! Your Laravel application has been created!"
       else
         Laravel::say_failed "Downloaded source is not Laravel framework or a possible fork."

data/lib/laravel/info.rb

@@ -16,8 +16,10 @@ module Laravel
       # use default settings and update Application Index
     laravel new my_app --key
       # use default settings and generate a new key
-    laravel new my_app --no_perms
+    laravel new my_app --no-perms
       # use default settings but do not update permissions on storage/ directory
+    laravel new my_app --generator
+      # use default settings and downloaded Laravel generator by Jeffrey Way
 
   Update Application Index on existing Laravel applications
   =========================================================
@@ -32,5 +34,12 @@ module Laravel
       # in the current directory
     laravel generate_key --app=./laravel
       # for application in the specified directory
+
+  Download Laraevl Generator by Jeffrey Way
+  =========================================
+    laravel get_generator
+      # in the current directory
+    laravel get_generator --app=./laravel
+      # for application in the specified directory
   '''
 end

data/lib/laravel/manage.rb

@@ -32,6 +32,35 @@ module Laravel
       end
     end
 
+    # download the Laravel Generator by Jeffrey Way
+    #
+    # * *Args*    :
+    #   - +app_directory+ -> the directory of the Laravel app, defaults to current working directory
+    #
+    def self.get_generator(app_directory = nil)
+      # default to current working directory if path is not specified
+      app_directory ||= Dir.pwd
+
+      # get the path to the tasks folder
+      tasks_directory = File.expand_path(File.join(app_directory, %w[ application tasks ]))
+
+      # download the Laravel Generator
+      generator_url  = "https://raw.github.com/JeffreyWay/Laravel-Generator/master/generate.php"
+      generator_file = File.join(tasks_directory, "generate.php")
+      success = case
+      when `which curl` then system("curl -s #{generator_url} > #{generator_file}")
+      when `which wget` then system("wget -s #{generator_url} -O #{generator_file}")
+      else false
+      end
+
+      # display appropriate output to the user
+      if success
+        Laravel::say_success "Downloaded Laravel Generator by Jeffrey Way"
+      else
+        Laravel::say_failed "Could not download Laravel Generator"
+      end
+    end
+
     private
 
     def self.change_configuration(match, replace, app_directory = nil)

data/lib/laravel/version.rb

@@ -1,3 +1,3 @@
 module Laravel
-  VERSION = "0.1.4"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: laravel
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -77,7 +77,7 @@ files:
 - features/S_1_new.feature
 - features/S_2_generate_key.feature
 - features/S_3_update_index.feature
-- features/S_4_install_bundles.feature
+- features/S_4_generator.feature
 - features/step_definitions/laravel.rb
 - features/support/env.rb
 - features/support/laravel_helpers.rb
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4483550955882994531
+      hash: 3710655952266878729
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4483550955882994531
+      hash: 3710655952266878729
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -125,7 +125,7 @@ test_files:
 - features/S_1_new.feature
 - features/S_2_generate_key.feature
 - features/S_3_update_index.feature
-- features/S_4_install_bundles.feature
+- features/S_4_generator.feature
 - features/step_definitions/laravel.rb
 - features/support/env.rb
 - features/support/laravel_helpers.rb

data/features/S_4_install_bundles.feature

@@ -1,20 +0,0 @@
-Feature: Install bundles for Laravel application
-  In order to extend the functionality of my Laravel application
-  As a PHP developer acquinted with ruby
-  I want to use Laravel gem to install Laravel bundles for me
-
-  @may_require_repository_download @focus @announce
-  Scenario: install a new bundle for a Laravel application
-    Given laravel application exists in "my_app" directory
-    And   "bob" bundle must not be installed for "my_app" application
-    When  I run `laravel install_bundles "bob" --app=my_app`
-    Then  the stdout should contain "Installed bundle: Bob"
-    And   "bob" bundle must be installed for "my_app" application
-
-  @may_require_repository_download @focus @announce
-  Scenario: create Laravel application with some bundles
-    When  I run `laravel new my_app --bundles=bob,bootstrapper,anbu`
-    Then  laravel application should be ready to use in "my_app" directory
-    And   "bob" bundle must be installed for "my_app" application
-    And   "bootstrapper" bundle must be installed for "my_app" application
-    And   "anbu" bundle must be installed for "my_app" application