pave 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73f1328426b5077aeaa1d8f9a7056cb0d23f4966
-  data.tar.gz: 6d44d7901e194239707394d3c46739a71c358869
+  metadata.gz: f7b913d65cca08e6ccdef3280bea1a2189e7be14
+  data.tar.gz: 6066f4e6a7b53448d9c3592659aecf2ce925e354
 SHA512:
-  metadata.gz: a4cd5bb23917e1b6d991a298409cefbb36e0c649ddb8e9d3bbd50e384e7d0df7e5d7f043b2be73f58d412a213076eb90fef38c8afee1369efe9dff248074272a
-  data.tar.gz: dce87fdfcb7ef23f116001cde04e2fcb1b134856432dec4462555e7367bfb1120de4a5bb1f270d4dfa2c69c93391dd8060e332ad6b258e4c3ef0ac04fed69406
+  metadata.gz: d25936c38deeb4e435975b4e158d5408aeafdc7cb8b8c0e83804d240854837e48639636ea788cae6fb20c1d69ef46b9e2da5d7caf9f71730c0181b706ae2211a
+  data.tar.gz: dbfae2536ed7f62cecf071407760d5054466cf8fa2a5700fe39d870a3af0e36d394817466ebc2556d98aa3631f74d424bff61030ce6576209f01019b8c9eddfe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pave (0.4.3999)
+    pave (0.6.0)
       commander (~> 4.1.5)
 
 GEM
@@ -9,11 +9,20 @@ GEM
   specs:
     commander (4.1.5)
       highline (~> 1.6.11)
+    diff-lcs (1.2.5)
     highline (1.6.20)
-    json (1.8.0)
+    json (1.8.1)
     rake (0.9.6)
     rdoc (4.0.1)
       json (~> 1.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
 
 PLATFORMS
   ruby
@@ -23,3 +32,4 @@ DEPENDENCIES
   pave!
   rake (~> 0.9.2)
   rdoc
+  rspec (~> 2)

data/Rakefile

@@ -1,53 +1,11 @@
-def dump_load_path
-  puts $LOAD_PATH.join("\n")
-  found = nil
-  $LOAD_PATH.each do |path|
-    if File.exists?(File.join(path,"rspec"))
-      puts "Found rspec in #{path}"
-      if File.exists?(File.join(path,"rspec","core"))
-        puts "Found core"
-        if File.exists?(File.join(path,"rspec","core","rake_task"))
-          puts "Found rake_task"
-          found = path
-        else
-          puts "!! no rake_task"
-        end
-      else
-        puts "!!! no core"
-      end
-    end
-  end
-  if found.nil?
-    puts "Didn't find rspec/core/rake_task anywhere"
-  else
-    puts "Found in #{path}"
-  end
-end
-require "bundler"
-require "rake/clean"
-
-require "rake/testtask"
-
-require "cucumber"
-require "cucumber/rake/task"
-gem "rdoc" # we need the installed RDoc gem, not the system one
-require "rdoc/task"
-
-include Rake::DSL
-
-Bundler::GemHelper.install_tasks
-
-
-Rake::TestTask.new do |t|
-  t.pattern = "test/tc_*.rb"
-end
-
-Rake::RDocTask.new do |rd|
-
-  rd.main = "README.rdoc"
+require "rspec/core/rake_task"
+require "bundler/gem_tasks"
 
-  rd.rdoc_files.include("lib/**/*.rb","bin/**/*")
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.verbose = false
+  t.rspec_opts = '--color --order random'
 end
 
-task :default => [:test,:features]
+task :default => :spec
 

data/bin/pave

@@ -132,11 +132,58 @@ command :"db:dump" do |c|
 end
 alias_command :"db:backup", :"db:dump"
 
+command :"db:remote:dump" do |c|
+  c.syntax = "pave db:remote:dump DATABASE"
+  c.description = "Create SQL dump of the project's live database."
+  c.action do |args|
+    name = args.first || "#{File.basename(Dir.pwd)}"
+    Pave::Database.new(name).dump_remote
+  end
+end
+alias_command :"db:remote:backup", :"db:remote:dump"
+
+command :"db:execute" do |c|
+  c.syntax = "pave db:execute DATABASE"
+  c.description = "Execute SQL dump on the project's database."
+  c.action do |args|
+    name = args.first || "#{File.basename(Dir.pwd)}"
+    Pave::Database.new(name).execute
+  end
+end
+
+command :"db:remote:execute" do |c|
+  c.syntax = "pave db:remote:execute DATABASE"
+  c.description = "Execute SQL dump on the project's live database."
+  c.action do |args|
+    name = args.first || "#{File.basename(Dir.pwd)}"
+    Pave::Database.new(name).execute_remote
+  end
+end
+
+command :"db:download" do |c|
+  c.syntax = "pave db:download DATABASE"
+  c.description = "Download SQL dump of the project's live database."
+  c.action do |args|
+    name = args.first || "#{File.basename(Dir.pwd)}"
+    Pave::Database.new(name).download
+  end
+end
+
+command :"db:upload" do |c|
+  c.syntax = "pave db:upload DATABASE"
+  c.description = "Upload SQL dump of the project's database."
+  c.action do |args|
+    name = args.first || "#{File.basename(Dir.pwd)}"
+    Pave::Database.new(name).upload
+  end
+end
+
 command :"db:pull" do |c|
   c.syntax = "pave db:pull"
   c.description = "Download the project's live database and replace local database."
   c.action do |args|
-    say "`db:pull` command not implemented yet."
+    name = args.first || "#{File.basename(Dir.pwd)}"
+    Pave::Database.new(name).pull
   end
 end
 
@@ -144,7 +191,8 @@ command :"db:push" do |c|
   c.syntax = "pave db:push"
   c.description = "Upload the project's local database and replace the live database."
   c.action do |args|
-    say "`db:push` command not implemented yet."
+    name = args.first || "#{File.basename(Dir.pwd)}"
+    Pave::Database.new(name).push
   end
 end
 
@@ -172,7 +220,7 @@ command :"deploy" do |c|
   c.action do |args|
     remote = args[0] || "live"
     branch = args[1] || "master"
-    Pave::Deploy.new.deploy(remote, branch)
+    Pave::Remote.deploy(remote, branch)
   end
 end
 
@@ -180,6 +228,6 @@ command :"deploy:setup" do |c|
   c.syntax = "pave deploy:setup"
   c.description = "Setup deployment via git to web server."
   c.action do
-    Pave::Deploy.new.setup
+    Pave::Remote.setup
   end
 end

data/lib/pave/database.rb

@@ -19,6 +19,28 @@ module Pave
       sh "mysql -uroot -e 'CREATE DATABASE #{name}'"
     end
 
+    def remote_db
+      require 'json'
+      live_domain = shell("php -r \"error_reporting(0);require('./config/site.php');echo LIVE_DOMAIN;\"").output
+      db_json = shell("php -r \"error_reporting(0);"\
+                      "\\$_SERVER = array('HTTP_HOST' => '#{live_domain}');"\
+                      "require('./config/site.php');"\
+                      "echo json_encode("\
+                        "array('host' => DB_SERVER,"\
+                              "'user' => DB_USERNAME,"\
+                              "'pass' => DB_PASSWORD,"\
+                              "'name' => DB_DATABASE));\"").output
+      JSON.parse(db_json)
+    end
+
+    def remote_url(remote="live")
+      "#{Pave::Remote.server(remote)}:#{Pave::Remote.directory(remote)}"
+    end
+
+    def dump_file
+      "#{Time.now.strftime("%Y-%m-%d")}-#{name}.sql.gz"
+    end
+
     def dump
       if !File.directory?('db')
         sh "mkdir ./db"
@@ -26,19 +48,54 @@ module Pave
         sh "echo 'deny from all' > ./db/.htaccess"
         sh "sudo chmod -R 700 ./db/"
       end
-      dbname = Time.now.strftime("%Y-%m-%d-%H%M") + "-" + name + ".sql.gz"
-      say "Creating dump of #{name} at #{Dir.pwd}/db/#{dbname}"
-      sh "mysqldump -uroot #{name} | gzip > ./db/#{dbname}"
-      say "Dump complete."
+      say "Creating dump of #{name} at #{Dir.pwd}/db/#{dump_file}"
+      sh "mysqldump -uroot #{name} | gzip > ./db/#{dump_file}"
     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}"
+    def dump_remote(remote="live")
+      server = Pave::Remote.server(remote)
+      directory = Pave::Remote.directory(remote)
+      db = remote_db
+      say "Remotely creating dump of #{db['name']} at #{server}:#{directory}/db/#{dump_file}"
+      sh "ssh #{server} \"cd #{directory}/db; mysqldump -u#{db['user']} -p#{db['pass']} #{db['name']} | gzip > #{dump_file}\""
+    end
+
+    def execute
+      say "Executing #{dump_file} on #{name}"
+      sh "gzip -dc ./db/#{dump_file} | mysql -uroot #{name}"
     end
 
-    def upload
+    def execute_remote(remote="live")
+      server = Pave::Remote.server(remote)
+      directory = Pave::Remote.directory(remote)
+      say "Remotely executing #{dump_file} on live #{db['name']}"
+      sh "ssh #{server} \"cd #{directory}/db; gzip -dc #{dump_file} | mysql -u#{db['user']} -p#{db['pass']} #{db['name']}\""
+    end
+
+    def upload(remote="live")
+      # Upload the project's local database dump to remotes db directory.
+      say "Uploading SQL dump to #{remote_url}/db/#{dump_file}"
+      sh "scp ./db/#{dump_file} #{remote_url}/db"
+    end
+
+    def download(remote="live")
+      # Download the project's live database dump to local db directory.
+      say "Downloading SQL dump from #{remote_url}/db/#{dump_file}"
+      sh "scp #{remote_url}/db/#{dump_file} ./db"
+    end
+
+    def push(remote="live")
       # Upload the project's local database and replace the live database.
+      dump
+      upload(remote)
+      execute_remote(remote)
+    end
+
+    def pull(remote="live")
+      # Download the project's live database and replace local database.
+      dump_remote(remote)
+      download(remote)
+      execute
     end
   end
 end

data/lib/pave/{deploy.rb → remote.rb}

@@ -1,8 +1,8 @@
 module Pave
-  class Deploy
+  class Remote
     include Pave::Shell
 
-    def setup
+    def self.setup
       server = ask "Username and hostname of the remote server (e.g. user@server.com): "
       folder = ask "Name of the remote directory (e.g. ~/webapps/appname/): "
       remote = ask "Desired git remote name (e.g. live): "
@@ -17,9 +17,22 @@ module Pave
       puts "Finished! You may now run `pave deploy` to deploy your application."
     end
 
-    def deploy(remote="live", branch="master")
+    def self.deploy(remote="live", branch="master")
       sh "git push #{remote} #{branch}"
     end
+
+    def self.url(remote="live")
+      remotes = shell("git remote -v").output
+      remotes.match(/#{remote}\s+(.*)\s+\(push\)/)[1]
+    end
+
+    def self.server(remote="live")
+      self.url(remote).split(":").first
+    end
+
+    def self.directory(remote="live")
+      self.url(remote).split(":").last.gsub("/deploy.git", "")
+    end
   end
 end
 

data/lib/pave/shell.rb

@@ -1,5 +1,9 @@
 module Pave
   module Shell
+    def Shell.included base
+      base.extend Shell
+    end
+
     def shell(command)
       output = `#{command}`
       Struct.new(:status, :output).new($?, output)

data/lib/pave/theme.rb

@@ -39,7 +39,7 @@ module Pave
       say "Installing Bitters"
       sh "gem install bitters"
       sh "cd themes/#{self.name}/css/ && bitters install && cd -"
-    end    
+    end
 
     def copy_theme
       sh "cp -a #{Pave.template_folder}/themes/blank #{Dir.pwd}/themes/#{self.name}"
@@ -59,4 +59,4 @@ module Pave
     end
 
   end
-end
+end

data/lib/pave/version.rb

@@ -1,3 +1,3 @@
 module Pave
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/pave.rb

@@ -4,8 +4,8 @@ require "pave/shell"
 require "pave/concrete"
 require "pave/database"
 require "pave/virtual_host"
+require "pave/remote"
 require "pave/theme"
-require "pave/deploy"
 
 module Pave
   def update
@@ -15,9 +15,8 @@ module Pave
   end
   module_function :update
 
-  def template_folder 
+  def template_folder
     script = File.join(File.expand_path("../", File.dirname(__FILE__)), "templates")
-  end  
+  end
   module_function :template_folder
-
 end

data/pave.gemspec

@@ -15,12 +15,12 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test)/})
+  spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency("bundler", "~> 1.3")
-  spec.add_development_dependency("rake")
   spec.add_development_dependency("rdoc")
   spec.add_development_dependency("rake", "~> 0.9.2")
+  spec.add_development_dependency("rspec", "~> 2")
   spec.add_dependency("commander", "~> 4.1.5")
 end

data/spec/concrete_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Pave::Concrete do
+  let(:subject) { Pave::Concrete.new("test") }
+
+  before :each do
+    mock_terminal
+  end
+  
+  describe '#setup' do
+    it "returns a string with /templates" do
+      subject.setup.should be_kind_of(Pave::Concrete)
+    end
+  end
+  
+end

data/spec/pave_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Pave do
+  
+  before :each do
+    mock_terminal
+  end
+  
+  describe '.template_folder' do
+    it "returns a string with /templates" do
+      Pave.template_folder.should include("/templates")
+    end
+  end
+  
+end

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+require 'rubygems'
+require 'stringio'
+
+# Unshift so that local files load instead of something in gems
+$:.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'pave'
+
+# Mock terminal IO streams so we can spec against them
+
+def mock_terminal
+  @input = StringIO.new
+  @output = StringIO.new
+  $terminal = HighLine.new @input, @output
+end
+

data/templates/themes/blank/css/styles.scss

@@ -1,2 +1,2 @@
 @import 'bourbon/_bourbon';
-@import 'neat/_neat';
+@import 'neat/_neat';

data/templates/themes/blank/elements/header.php

@@ -14,7 +14,7 @@
     <![endif]-->
   </head>
 
-	<body class="<?= $c->getCollectionTypeHandle(); ?>">
+        <body class="<?= $c->getCollectionTypeHandle(); ?>">
 
 
     <!-- BLOCK EXAMPLE -->
@@ -33,4 +33,4 @@
       $nav->controller->displaySubPageLevels = 'custom';
       $nav->controller->displaySubPageLevelsNum = 1;
       $nav->render('templates/header_menu');
-    ?>
+    ?>

data/templates/themes/blank/includes/functions.php

@@ -0,0 +1,8 @@
+<?
+  function editmode() {
+    global $c;
+    if ($c->isEditMode()) {
+      echo "editMode";
+    }
+  }
+?>

data/templates/themes/blank/js/scripts.js

@@ -1,7 +1,3 @@
 $(document).ready(function(){
 
-
-
-
-
-});
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pave
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -40,33 +40,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -101,23 +101,30 @@ files:
 - lib/pave.rb
 - lib/pave/concrete.rb
 - lib/pave/database.rb
-- lib/pave/deploy.rb
+- lib/pave/remote.rb
 - lib/pave/shell.rb
 - lib/pave/theme.rb
 - lib/pave/version.rb
 - lib/pave/virtual_host.rb
 - pave.gemspec
 - resources/deploy.sh
+- spec/concrete_spec.rb
+- spec/database_spec.rb
+- spec/pave_spec.rb
+- spec/remote_spec.rb
+- spec/shell_spec.rb
+- spec/spec_helper.rb
+- spec/virtual_host_spec.rb
 - templates/themes/blank/css/styles.scss
 - templates/themes/blank/default.php
 - templates/themes/blank/description.txt
 - templates/themes/blank/elements/footer.php
 - templates/themes/blank/elements/header.php
+- templates/themes/blank/includes/functions.php
 - templates/themes/blank/includes/view_helpers.php
 - templates/themes/blank/js/scripts.js
 - templates/themes/blank/thumbnail.png
 - templates/themes/blank/view.php
-- test/pave_test.rb
 homepage: https://github.com/jamonholmgren/pave
 licenses:
 - MIT
@@ -143,4 +150,10 @@ signing_key:
 specification_version: 4
 summary: Provides a set of command line tools for Concrete5.
 test_files:
-- test/pave_test.rb
+- spec/concrete_spec.rb
+- spec/database_spec.rb
+- spec/pave_spec.rb
+- spec/remote_spec.rb
+- spec/shell_spec.rb
+- spec/spec_helper.rb
+- spec/virtual_host_spec.rb

data/test/pave_test.rb

@@ -1,7 +0,0 @@
-require "test/unit"
-
-class PaveTest < Test::Unit::TestCase
-  def test_is_module
-    assert Pave.is_a?(Module)
-  end
-end