squarespace-sync 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 838bce92e3947380a1d4d6dd6bce462d44045411
-  data.tar.gz: cb6553212cf083cc00a2f429f3a0a3bf841226bc
+  metadata.gz: 249d5912232d3b6c400770ea2eadfd1025c5b504
+  data.tar.gz: a97829f5a14af20723c33f8ee52c6d6a7dc4cc5b
 SHA512:
-  metadata.gz: 1a3a966314f615054ba75ddb49da18afb0cec9102de10896ce2f05bceb18659bd4c969417b186a448666ecf36c6e0c476621ea1e8c274a17105efd9cdb2f29e8
-  data.tar.gz: 48f38a1f0e91108fb6244d55871294de834ed64fb6e1eaee3f72894a71c3fd4a42abf19ba358d8d4b0a0dc617f934d9f7c57c6963abc3fcd92b0f43c3383d375
+  metadata.gz: b1005d5a7542cc92cceea81f3fa1b11adedfdb59f1411190cd96306c1a698192ab5e80507998ec5887b4ada97a6258fdeac0c40bb63fa137d6a30564c5d0db3a
+  data.tar.gz: 45b87d2cb0ed9dceb2cc95b43b813a0f8aa5380eb6f5e98f27cd03c48e5f60290387f38dd118735d7637c21bbd56ace956f27b93c49fa5be217505d4a30b2d34

data/README.md

@@ -26,16 +26,18 @@ $ squarespace setup
 
 Update `squarespace.yaml` with your account settings, and then you can run either of these commands:
 
-Pull files from Squarespace. Warns if there are conflicts
+Pull all files or a single file from Squarespace. Warns if there are conflicts
 
 ```
 $ squarespace pull
+$ squarespace pull template.conf
 ```
 
-Push files to Squarespace, overwriting existing
+Push all files or a single file to Squarespace, overwriting existing
 
 ```
 $ squarespace push
+$ squarespace push template.conf
 ```
 
 

data/lib/squarespace/sync/cli.rb

@@ -23,17 +23,27 @@ module Squarespace
         template( template_file, output_file, options )
       end
 
-      desc "push", "Push files to Squarespace"
-      def push
-        Connection.new do |sftp, options, connection|
-          connection.push_tree( sftp, options[:directory] )
+      desc "push FILE", "Push files to Squarespace"
+      def push(file=nil)
+        Connection.new do |sftp, options, instance|
+          if file
+            local_file = File.join(Squarespace::Sync.local_path, file)
+            instance.push_file( sftp, file, File.join(options[:directory], local_file) )
+          else
+            instance.push_tree( sftp, options[:directory] )
+          end
         end
       end
 
-      desc "pull", "Pull files from Squarespace"
-      def pull
-        Connection.new do |sftp, options, connection|
-          connection.pull_tree( sftp, options[:directory] )
+      desc "pull FILE", "Pull files from Squarespace"
+      def pull(file=nil)
+        Connection.new do |sftp, options, instance|
+          if file
+            local_file = File.join(Squarespace::Sync.local_path, file)
+            instance.pull_file( sftp, File.join(options[:directory], file), local_file )
+          else
+            instance.pull_tree( sftp, options[:directory] )
+          end
         end
       end
 

data/lib/squarespace/sync/connection.rb

@@ -16,47 +16,56 @@ module Squarespace
 
         def pull_tree( sftp, directory )
           sftp.dir[directory, "**/*"].each do |entry|
-            remote_file = File.join(directory, entry.name)
-            local_file = File.join(Squarespace::Sync.local_path, entry.name)
+            remote = File.join(directory, entry.name)
+            local = File.join(Squarespace::Sync.local_path, entry.name)
 
-            if sftp.file.directory?( remote_file )
-              FileUtils.mkdir_p( local_file )
+            if sftp.file.directory?( remote )
+              FileUtils.mkdir_p( local )
             else
-              if File.exists?( local_file )
-                overwrite = ask("#{entry.name} already exists. Overwrite it?", :yellow, limited_to: %w{y n})
-                if overwrite == "y"
-                  sftp.download!(remote_file, local_file)
-                end
-              else
-                say("Downloading #{entry.name}", :green)
-                sftp.download!(remote_file, local_file)
-              end
+              pull_file( sftp, remote, local )
             end
           end
         end
 
+        def pull_file( sftp, remote, local )
+          if File.exists?( local )
+            overwrite = ask("#{local} already exists. Overwrite it?", :yellow, limited_to: %w{y n})
+            if overwrite == "y"
+              say("Downloading #{remote}", :green)
+              sftp.download!(remote, local)
+            end
+          else
+            say("Downloading #{remote}", :green)
+            sftp.download!(remote, local)
+          end
+        end
+
         def push_tree( sftp, directory )
-          Dir[File.join(Squarespace::Sync.local_path, "**/*")].each do |file|
-            remote_file = file.gsub(Squarespace::Sync.local_path + "/", "")
-            real_path = File.join(directory, remote_file)
-            next if Squarespace::Sync.options[:ignore].include?( remote_file.split("/").first )
+          Dir[File.join(Squarespace::Sync.local_path, "**/*")].each do |local|
+            remote = local.gsub(Squarespace::Sync.local_path + "/", "")
+            absolute_remote = File.join(directory, remote)
+            next if Squarespace::Sync.options[:ignore].include?( remote.split("/").first )
 
-            if File.directory?( file )
-              sftp.mkdir!( real_path ) unless sftp.file.directory?( real_path )
+            if File.directory?( local )
+              sftp.mkdir!( absolute_remote ) unless sftp.file.directory?( absolute_remote )
             else
-              say("Uploading #{remote_file}", :green)
-
-              begin
-                sftp.upload!( file, real_path )
-              rescue Net::SFTP::StatusException => code
-                sftp.remove!( real_path ) do
-                  sftp.upload!( file, real_path )
-                end if code == 11
-              end
+              push_file( sftp, local, absolute_remote)
             end
           end
         end
 
+        def push_file( sftp, local, remote )
+          say("Uploading #{remote}", :green)
+
+          begin
+            sftp.upload!( local, remote )
+          rescue Net::SFTP::StatusException => code
+            sftp.remove!( remote ) do
+              sftp.upload!( local, remote )
+            end if code == 11
+          end
+        end
+
       end
 
     end

data/lib/squarespace/sync/version.rb

@@ -1,5 +1,5 @@
 module Squarespace
   module Sync
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squarespace-sync
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - jordanandree