cynq 0.0.2 → 0.0.3

data/README.md

@@ -48,7 +48,7 @@ remotes:
 ```
 
 This would instruct cynq to upload the contents of the ```build``` directory.
-The ```build``` directory itself is not uploaded, making your ```index.hml```
+The ```build``` directory itself is not uploaded, making your ```index.html```
 file at the 'top-level' of your bucket.
 
 You also need AWS key information in your environment.  Make sure to do something

data/lib/cynq/command.rb

@@ -9,6 +9,10 @@ module Cynq
     desc "deploy REMOTE", "Upload files to REMOTE"
     method_option :dry_run, :type => :boolean, :aliases => "-n",
                     :default => false, :desc => 'Do not do anything.'
+
+    attr_reader :local_dir, :remote_dir
+
+
     def deploy(remote)
       load_config(remote)
 
@@ -16,24 +20,22 @@ module Cynq
         puts "  Dry run executing...".green
       end
 
-      local  = Local.new(@local_root)
-      remote = Remote.new(@remote['directory'])
+      establish_roots
 
-      p local
-      p remote
-
-      keys = (local.keys + remote.keys).sort
-      keys.each do |key|
+      all_keys.each do |key|
         case
-        when local.missing?(key)
+        when local_dir.missing?(key)
           puts "  deleting #{key}".red
-          remote.delete(key) unless options.dry_run?
-        when remote.missing?(key)
-          puts "    adding #{key}".green
-          remote << local[key] unless options.dry_run?
-        when remote.modified?(local[key])
+          remote_dir.delete(key) unless options.dry_run?
+        when remote_dir.missing?(key)
+          puts "    adding #{key} #{local_dir[key].content_type}".green
+          remote_dir << local_dir[key] unless options.dry_run?
+        when remote_dir.modified?(local_dir[key])
           puts "  modified #{key}".magenta
-          remote << local[key] unless options.dry_run?
+          remote_dir << local_dir[key] unless options.dry_run?
+        when !remote_dir.meta_equal?(local_dir[key])
+          puts "      meta #{key} #{local_dir[key].content_type}".white.on_magenta
+          remote_dir << local_dir[key] unless options.dry_run?
         else
           puts " unchanged #{key}" unless options.dry_run?
         end
@@ -41,9 +43,20 @@ module Cynq
     end
 
     no_tasks do
+
+      def establish_roots
+        p (@local_dir  = Local.new(@local_root))
+        p (@remote_dir = Remote.new(@remote_root['directory']))
+      end
+
+      def all_keys
+        (local_dir.keys + remote_dir.keys).sort
+      end
+
+
       def load_config(remote)
         conf_file = File.expand_path('cynq.yml')
-        
+
         unless File.exist?(conf_file)
           $stderr.puts "Missing configuration file at #{conf_file}"
           raise "Configuration not found"
@@ -57,8 +70,8 @@ module Cynq
           raise "Configuration is invalid"
         end
 
-        @remote = @config['remotes'][remote]
-        unless @remote
+        @remote_root = @config['remotes'][remote]
+        unless @remote_root
           $stderr.puts("No environment matching '#{remote}' can be found.")
           raise "Configuration is invalid"
         end

data/lib/cynq/directory.rb

@@ -31,9 +31,9 @@ module Cynq
           :key => other_file.key,
           :body => other_file.body
         })
-        ct = content_type_for_key(other_file.key)
-        file.content_type = ct if ct
       end
+      ct = content_type_for_key(other_file.key)
+      file.content_type = ct if ct
       file.public = true
       file.save
     end
@@ -48,6 +48,10 @@ module Cynq
       other_file.etag != self[other_file.key].etag
     end
 
+    def meta_equal?(other_file)
+      self[other_file.key].content_type == other_file.content_type
+    end
+
     def inspect
       "#{self.class.name}: #{@bucket.key} (#{keys.size} files, #{size} bytes)"
     end
@@ -69,7 +73,7 @@ module Cynq
 
     def read_current_files
       @current_files = @bucket.files.inject({}) do |hsh, file|
-        hsh[file.key] = file
+        hsh[file.key] = @bucket.files.head(file.key)
         hsh
       end
       @keys = Set.new(@current_files.keys)

data/lib/cynq/version.rb

@@ -1,3 +1,3 @@
 module Cynq
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cynq
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70107579317080 !ruby/object:Gem::Requirement
+  requirement: &70197370073900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70107579317080
+  version_requirements: *70197370073900
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70107579316560 !ruby/object:Gem::Requirement
+  requirement: &70197370073400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70107579316560
+  version_requirements: *70197370073400
 description: Easy synchronization of local files to cloud based storage.
 email:
 - dboyd@realgravity.com