pave 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dc8b7e8bd29f9a86f40372a62061ecc6f30133e
-  data.tar.gz: a3bc9d455fa2566e22b376a389702fdf85a6c4e6
+  metadata.gz: dca6ce62e803a633172e15f128a10c1db7ddb46e
+  data.tar.gz: 6abf652c95be62aa92e2229c31299376a76c6aa1
 SHA512:
-  metadata.gz: 92b868fff8511163232b3938f481f16b06f7dfabe715cf6246ed75a153fc5ea01dcbeccab1f5494dd419d56eb2e74a40b1df22c847487609fccbc34903a79d74
-  data.tar.gz: f68e70453aedaf66569cea22f3f0784c3ed44b2a9e8a04eef64bbae9b45d563219818b0ac1bac8753c0b7640af65feaf776c15e3158e81fbffabaed36e68c302
+  metadata.gz: 99e429cd2172c75461de4812b0f614a29597d0d34b02c733a057877c5010e59e8b73a9b8e21f2d7d2515d906381068af99bd6fb4cbbc3ea017aa8531b6dae74b
+  data.tar.gz: 73b1a73e6e88ec5f22b81c16478a3b8b90ba98bed9d79cbc9119fbdb2e3183b42511d7e5f3bb370fa0e5b0a80dd32933fe12cf6f0c3828eb38bb7cddfc1356d1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pave (0.1.0)
+    pave (0.2.3)
       commander (~> 4.1.5)
 
 GEM

data/bin/pave

@@ -12,8 +12,8 @@ default_command :help
 command :new do |c|
   c.syntax = "pave new APP_PATH [options]"
   c.description = "Create a new Concrete5 project."
-  c.action do |args, options|
-    Pave::Concrete.create(args.first, options)
+  c.action do |args|
+    Pave::Concrete.create(args.first)
   end
 end
 
@@ -27,10 +27,10 @@ end
 
 command :setup do |c|
   c.syntax = "pave setup APP_PATH"
-  c.description = "Setup app folder for project."
+  c.description = "Setup folders for project."
   c.action do |args|
-    name = args.first || Dir.getwd
-    Pave::Concrete.new(name).set_up_app_folder
+    name = args.first || Dir.pwd
+    Pave::Concrete.new(name).set_up_folders
   end
 end
 alias_command :"setup:app", :setup
@@ -39,17 +39,8 @@ command :"setup:git" do |c|
   c.syntax = "pave setup:git APP_PATH"
   c.description = "Setup git repo for project."
   c.action do |args|
-    name = args.first || Dir.getwd
-    Pave::Concrete.new(name).initialize_git
-  end
-end
-
-command :"setup:symlinks" do |c|
-  c.syntax = "pave setup:symlinks APP_PATH"
-  c.description = "Setup app folder symlinks for project."
-  c.action do |args|
-    name = args.first || Dir.getwd
-    Pave::Concrete.new(name).symlink_folders
+    name = args.first || Dir.pwd
+    Pave::Concrete.new(name).set_up_git
   end
 end
 
@@ -57,7 +48,7 @@ command :"setup:permissions" do |c|
   c.syntax = "pave setup:permissions APP_PATH"
   c.description = "Setup folder permissions for project."
   c.action do |args|
-    name = args.first || Dir.getwd
+    name = args.first || Dir.pwd
     Pave::Concrete.new(name).modify_folder_permissions
   end
 end
@@ -67,7 +58,7 @@ command :"setup:clean" do |c|
   c.syntax = "pave setup:cleanup APP_PATH"
   c.description = "Remove unused folders from project."
   c.action do |args|
-    name = args.first || Dir.getwd
+    name = args.first || Dir.pwd
     Pave::Concrete.new(name).remove_extra_folders
   end
 end
@@ -77,7 +68,8 @@ command :"virtualhost:create" do |c|
   c.syntax = "pave virtualhost:create VHOST"
   c.description = "Setup virtual host for Concrete5 project."
   c.action do |args|
-    Pave::VirtualHost.new(args.first).create_vhost
+    host = args.first || "#{File.basename(Dir.pwd)}.site"
+    Pave::VirtualHost.new(host).create_vhost
   end
 end
 alias_command :"vh:create", :"virtualhost:create"
@@ -86,7 +78,8 @@ command :"virtualhost:remove" do |c|
   c.syntax = "pave virtualhost:remove VHOST"
   c.description = "Delete virtual host."
   c.action do |args|
-    Pave::VirtualHost.new(args.first).remove_vhost
+    host = args.first || "#{File.basename(Dir.pwd)}.site"
+    Pave::VirtualHost.new(host).remove_vhost
   end
 end
 alias_command :"vh:remove", :"virtualhost:remove"
@@ -94,51 +87,53 @@ alias_command :"virtualhost:delete", :"virtualhost:remove"
 alias_command :"vh:delete", :"virtualhost:remove"
 
 command :"virtualhost:backup" do |c|
-  c.syntax = "pave virtualhost:backup VHOST"
+  c.syntax = "pave virtualhost:backup"
   c.description = "Back up virtual hosts file. Restore with `pave virtualhost:restore`."
-  c.action do |args|
-    Pave::VirtualHost.new(args.first).backup_vhost
+  c.action do
+    Pave::VirtualHost.new("").backup_vhost
   end
 end
 alias_command :"vh:backup", :"virtualhost:backup"
 
 command :"virtualhost:restore" do |c|
-  c.syntax = "pave virtualhost:restore VHOST"
+  c.syntax = "pave virtualhost:restore"
   c.description = "Restore previously backed up virtual hosts file."
-  c.action do |args|
-    Pave::VirtualHost.new(args.first).restore_vhost
+  c.action do
+    Pave::VirtualHost.new("").restore_vhost
   end
 end
 alias_command :"vh:restore", :"virtualhost:restore"
 
 command :"virtualhost:restart" do |c|
-  c.syntax = "pave virtualhost:restart VHOST"
+  c.syntax = "pave virtualhost:restart"
   c.description = "Restarts apache."
-  c.action do |args|
-    Pave::VirtualHost.new.restart_apache
+  c.action do
+    Pave::VirtualHost.new("").restart_apache
   end
 end
 alias_command :"vh:restart", :"virtualhost:restart"
 
 command :"db:create" do |c|
-  c.syntax = "pave db:create"
+  c.syntax = "pave db:create DATABASE"
   c.description = "Create the Concrete5 project's database."
   c.action do |args|
-    say "`db:create` command not implemented yet."
+    name = args.first || "#{File.basename(Dir.pwd)}"
+    Pave::Database.create(name)
   end
 end
 
 command :"db:dump" do |c|
-  c.syntax = "pave db:dump"
-  c.description = "Create SQL dump of the Concrete5 project's database."
+  c.syntax = "pave db:dump DATABASE"
+  c.description = "Create SQL dump of the project's database."
   c.action do |args|
-    say "`db:dump` command not implemented yet."
+    name = args.first || "#{File.basename(Dir.pwd)}"
+    Pave::Database.new(name).dump
   end
 end
 
 command :"db:download" do |c|
   c.syntax = "pave db:download"
-  c.description = "Download the Concrete5 project's live database and replace local database."
+  c.description = "Download the project's live database and replace local database."
   c.action do |args|
     say "`db:download` command not implemented yet."
   end
@@ -146,7 +141,7 @@ end
 
 command :"db:upload" do |c|
   c.syntax = "pave db:upload"
-  c.description = "Upload the Concrete5 project's local database and replace the live database."
+  c.description = "Upload the project's local database and replace the live database."
   c.action do |args|
     say "`db:upload` command not implemented yet."
   end

data/lib/pave/concrete.rb

@@ -4,7 +4,7 @@ module Pave
 
     attr_accessor :name
 
-    def self.create(name, options)
+    def self.create(name)
       say ""
       return say "Options should be given after the application name. For details run: `pave help`" unless name.size > 0
       say "Setting up Concrete5 in folder #{name}."
@@ -17,8 +17,8 @@ module Pave
 
     def setup
       clone_concrete5
-      set_up_app_folder
-      initialize_git
+      set_up_folders
+      set_up_git
       create_virtual_host
       self
     end
@@ -34,23 +34,20 @@ module Pave
       say "* Concrete5 downloaded and unzipped into ./#{name}."
     end
 
-    def set_up_app_folder
+    def set_up_folders
       say "* Setting up folders..."
-      sh "mkdir #{name}/app"
-
-      symlink_folders
       remove_extra_folders
       modify_folder_permissions
     end
 
-    def initialize_git
+    def set_up_git
       say "* Setting up git..."
       sh "touch #{name}/.gitignore"
       gitignored_folders.each{ |folder| sh "echo '#{folder}' >> #{name}/.gitignore" }
-      symlinked_folders.each{ |folder| sh "touch #{name}/app/#{folder}.keep" }
+      gitkeep_folders.each{ |folder| sh "touch #{name}/#{folder}/.keep" }
       sh "touch #{name}/files/.keep"
       sh "touch #{name}/updates/.keep"
-      sh "cd #{name} && git init && git add -A && git commit -m 'Initial'"
+      # sh "cd #{name} && git init && git add -A && git commit -m 'Initial'"
     end
 
     def gitignored_folders
@@ -64,39 +61,38 @@ module Pave
       ]
     end
 
-    def sudo?
-      `whoami` == "root"
-    end
-
     def create_virtual_host
-      if sudo?
-        Pave::VirtualHost.new("#{name}.site").create_vhost
+      say "* Setting up virtual host..."
+      if Pave::VirtualHost.new("#{name}.site").create_vhost
+        say "Successfully setup virtual host #{name}.site."
       else
-        say "Virtual host not set up. Run `sudo pave vh:create #{name}.site` to create it."
+        say "Virtual host not set up. Run `pave vh:create #{name}.site` to create it."
       end
     end
 
+    def in_project_dir?
+      File.basename(Dir.pwd) == name
+    end
+
     def modify_folder_permissions
-      world_writable_folders.each do |folder|
-        sh "chmod -R 777 #{folder}"
+      say "* Modifying folder permissions..."
+
+      successful = world_writable_folders.map do |folder|
+        sh "sudo chmod -R 777 #{in_project_dir? ? folder.to_s : name + '/' + folder.to_s}"
+      end.count{ |x| x != 0 } == 0
+
+      if successful
+        say "Successfully modified folder permissions."
+      else
+        say "Folder permissions not set up. Run `pave setup:permissions` to set them."
       end
     end
 
     def world_writable_folders
-      [
-        :config,
-        :packages,
-        :files
-      ]
-    end
-
-    def symlink_folders
-      symlinked_folders.each do |folder|
-        sh "ln -s #{name}/#{folder} app/#{folder}"
-      end
+      %w{ config packages files }
     end
 
-    def symlinked_folders
+    def gitkeep_folders
       [
         :blocks,
         :elements,

data/lib/pave/database.rb

@@ -4,6 +4,35 @@ module Pave
   class Database
     include Pave::Shell
 
+    attr_accessor :name
 
+    def self.create(name)
+      say ""
+      return say "Options should be given after the database name. For details run: `pave help`" unless name && name.size > 0
+      say "Creating mysql database: #{name}."
+      new(name).setup
+    end
+
+    def initialize(name)
+      @name = name
+    end
+
+    def setup
+      sh "mysql -uroot -e 'CREATE DATABASE #{name}'"
+    end
+
+    def dump
+      say "Creating dump of #{name} at #{Dir.pwd}/#{Time.now.strftime("%Y-%m-%d")}-#{name}.sql.gz"
+      sh "mysqldump -uroot #{name} | gzip > #{Time.now.strftime("%Y-%m-%d")}-#{name}.sql.gz"
+    end
+
+    def download(host, user, password)
+      # Download the project's live database and replace local database.
+      # sh "mysqldump -h#{host} -u#{user} -p#{password} #{name} | mysql -uroot #{name}"
+    end
+
+    def upload
+      # Upload the project's local database and replace the live database.
+    end
   end
 end

data/lib/pave/version.rb

@@ -1,3 +1,3 @@
 module Pave
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/pave/virtual_host.rb

@@ -11,17 +11,10 @@ module Pave
       @hostname = host
     end
 
-    def create_vhost
-      return say "No virtual host backup found. Run `pave vh:backup` before adding a virtual host." unless check_backup
-      return say "No host name provided. Run `pave help` for more details." unless hostname.size > 0
-
-      add_vhost_to_conf && add_hosts_entry && restart_apache && say("Created virtual host for #{hostname}.")
-    end
-
-    def remove_vhost
-      return say "No virtual host backup found. Run `pave vh:backup` before adding a virtual host." unless check_backup
-
-      remove_vhost_from_conf && remove_hosts_entry && restart_apache && say("Removed virtual host for #{hostname}.")
+    def restart_apache
+      `sudo apachectl restart`
+      say "Apache restarted."
+      true
     end
 
     def backup_vhost
@@ -46,10 +39,17 @@ module Pave
       say "Restored vhosts conf and host file."
     end
 
-    def restart_apache
-      code = sh "sudo apachectl restart"
-      say "Apache restarted."
-      true
+    def create_vhost
+      return say "No virtual host backup found. Run `pave vh:backup` before adding a virtual host." unless check_backup
+      return say "No host name provided. Run `pave help` for more details." unless hostname.size > 0
+
+      add_vhost_to_conf && add_hosts_entry && restart_apache && say("Created virtual host for #{hostname}.")
+    end
+
+    def remove_vhost
+      return say "No virtual host backup found. Run `pave vh:backup` before adding a virtual host." unless check_backup
+
+      remove_vhost_from_conf && remove_hosts_entry && restart_apache && say("Removed virtual host for #{hostname}.")
     end
 
     private
@@ -121,7 +121,7 @@ module Pave
     end
 
     def project_folder
-      Dir.getwd
+      Dir.pwd
     end
 
     def vhosts_file_array

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pave
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Provides a set of command line tools for Concrete5.