pave 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6423c30e10bd3cce7b5c9553be520a618a3b1dbc
-  data.tar.gz: 4d8f1ceccab04847564725e83db66cff7b998904
+  metadata.gz: b38e6f594c5ff73c9224b226f7fa0db8e8a25900
+  data.tar.gz: e759366eb0b826e4ba782be3206f0a22b1670809
 SHA512:
-  metadata.gz: c6f5c361651019a1f86b4753e6359a5ba1c8d1840eccca9ab27139fd73272acf6564c9031471b4bc1a9292ff7492af6f46fb738cff19c89e279244c2762572a2
-  data.tar.gz: 51d878220d60ea3dab49d55a3ad4e719d99f56311f025dd9b1b1557dc79e2ad8aed398028ae11b913f2427a07e2161f687f0e3ffe82486fcaf4d7bd54237bbfd
+  metadata.gz: f996742b54dc74322a724b36a6f3a8da05a66a4af655b4b0c3101545b232a27bc341557866fe0fed7e3ea172b035761a4c944b0c746c055e887d473d1d8b64b7
+  data.tar.gz: 7d6490bee57bfc713ad40cd351add931f01080e9589c987de872503ccfe5a42e6fece131a4e5c4813eabc921d113b4d8539c70a9b40ab01e72eb303e29bb6ef9

data/bin/pave

@@ -242,6 +242,15 @@ command :"files:push" do |c|
   end
 end
 
+command :"files:sync" do |c|
+  c.syntax = "pave files:sync"
+  c.description = "Syncronize local and remote files directories."
+  c.action do |args|
+    remote = args.first || "live"
+    Pave::Files.sync(remote)
+  end
+end
+
 command :"generate:theme" do |c|
   c.syntax = "pave generate:theme THEME_NAME"
   c.description = "Set up a blank theme with Sass and CoffeeScript support."

data/lib/pave/concrete.rb

@@ -30,8 +30,8 @@ module Pave
     end
 
     def clone_concrete5
-      c5 = "concrete5.6.2.1"
-      c5_link = "http://www.concrete5.org/download_file/-/view/58379/8497"
+      c5 = "concrete5.6.3.1"
+      c5_link = "http://www.concrete5.org/download_file/-/view/66159/8497/"
       unless File.exists?(File.join(Dir.home, ".pave/#{c5}.zip"))
         say "* Downloading #{c5}..."
         sh "curl #{c5_link} > ~/.pave/#{c5}.zip"
@@ -57,7 +57,7 @@ module Pave
 
     def add_config_customizations
       config_file = "#{name}/concrete/core/controllers/single_pages/install.php"
-      insert_pattern = "'{$salt}');\\n\";"
+      insert_pattern = "['DB_DATABASE']) . \"');\\n\";"
       file_insert config_file, insert_pattern, config_customizations
     end
 

data/lib/pave/files.rb

@@ -2,27 +2,34 @@ module Pave
   class Files
     include Pave::Shell
 
+    def self.exclusions
+      " --exclude 'files/tmp' --exclude 'files/cache' "
+    end
+
+    def self.flags
+      " -uazh -e ssh --progress "
+    end
+
     def self.clear_cache
       sh "rm -rf ./files/tmp/*; rm -rf ./files/cache/*;"
     end
 
     def self.push(remote="live")
-      clear_cache
       server = Pave::Remote.server(remote)
       directory = Pave::Remote.directory(remote)
-      sh "scp -r ./files #{server}:#{directory}/local_files;"
-      sh "ssh #{server} 'cd #{directory};
-          mv ./files ./old_files;
-          mv ./local_files ./files && rm -rf ./old_files;'"
+      sh "rsync #{flags} #{exclusions} ./files/* #{server}:#{directory}/files/*"
     end
 
     def self.pull(remote="live")
       server = Pave::Remote.server(remote)
       directory = Pave::Remote.directory(remote)
-      sh "scp -r #{server}:#{directory}/files ./remote_files;
-          mv ./files ./old_files;
-          mv ./remote_files ./files && rm -rf ./old_files;"
+      sh "rsync #{flags} #{exclusions} #{server}:#{directory}/files/* ./files/*"
       clear_cache
     end
+
+    def self.sync(remote="live")
+      pull(remote)
+      push(remote)
+    end
   end
 end

data/lib/pave/theme.rb

@@ -9,9 +9,20 @@ module Pave
     end
 
     def watch(browser)
-      system "pave livereload #{browser} &"
-      system "sass --watch ./themes/ --style compressed &"
-      system "coffee -wcj ./themes/#{name}/js/app.js ./themes/#{name}/js/"
+      processes = []
+      processes << Process.spawn("pave livereload #{browser}", out: $stdout, err: $stderr)
+      processes << Process.spawn("sass --watch ./themes/ --style compressed", out: $stdout, err: $stderr)
+      processes << Process.spawn("coffee -wcj ./themes/#{name}/js/app.js ./themes/#{name}/js/", out: $stdout, err: $stderr)
+
+      Signal.trap("INT") do
+        processes.map do |pid|
+          Process.kill("INT", pid)
+        end
+
+        exit!
+      end
+
+      Process.wait processes.sample # Just wait on a random process
     end
 
     def initialize(name)

data/lib/pave/version.rb

@@ -1,3 +1,3 @@
 module Pave
-  VERSION = "0.14.0"
+  VERSION = "0.14.1"
 end

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

@@ -1,3 +1,3 @@
 @import 'bourbon/bourbon';
 @import 'neat/neat';
-@import 'bitters/bitters';
+@import 'base/base';

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pave
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler