2cdn 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c996bcc49f1bca833dba20e11da6c94df4623ef
-  data.tar.gz: f8969fcce81a249e8c41cfb86da20ed5b8341384
+  metadata.gz: c691285e178f968741303fa060a4c2a327d8557f
+  data.tar.gz: 3b138f756a8d101de74fbab6c51d886c7de63d9a
 SHA512:
-  metadata.gz: a3054742ee178d240cebfc1b87c883680e4a90fb2e7332fe3d8237c3ad9508df1f750b8a587822db2735ba3ba507ee2982357ac8d5d487a4970d27d9b7c34bc7
-  data.tar.gz: 9a51696e1f77c49e93974060335d8eae02c9fadbc8dcf8ad3d3571867f3329907ed017a527d8b904aea9495067c13184717bab58d7c4f95a3b95366fe9b4936d
+  metadata.gz: 538b3f25fc313e7635de598ef4db24039996e248770bb2957ee839bb7eb1016683127d5b72c3045bac8714a1b4382a50714ca2de99a33d3aef8a41456222382c
+  data.tar.gz: 2911819ec352e3cdf660a28a1d9f506424d20a545ad7370361f3a945a9239f0e9a61d555c0366575dbd3dac0769ad18defe2c5963eb5c42cdc6520c0f90cb664

data/README.md

@@ -9,7 +9,7 @@ TODO: Delete this and the text above, and describe your gem
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'AutoAliCDN'
+gem '2cdn'
 ```
 
 And then execute:
@@ -18,11 +18,25 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install AutoAliCDN
+    $ gem install 2cdn
 
 ## Usage
 
-TODO: Write usage instructions here
+### Setup
+
+    $ 2cdn setup
+
+### Edit config
+
+    $ vim config/2cdn.yml
+
+### Upload
+
+    $ 2cdn upload my_path/my.zip remote_path
+
+### Download
+
+    $ 2cdn download remote_path/2018.1.zip my_path/2018.1.zip
 
 ## Development
 
@@ -38,4 +52,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/bin/2cdn

@@ -11,10 +11,10 @@ Options:
   -V, --version     Show program version
 
 Basic usage:
-  2cdn help    # Show help
-  2cdn setup   # Init oss file paths
-  2cdn upload  # Upload resources to Aliyun Oss
-  2cdn debug   # Change resources path to local path
+  2cdn help       # Show help
+  2cdn setup      # Init oss file paths
+  2cdn upload     # Upload resources to Aliyun Oss `2cdn upload $local_file $remote_file $is_delete`
+  2cdn download   # Download resources path to local path
   EOB
 end
 
@@ -39,9 +39,6 @@ end
 
 if ARGV[0] =~ /^setup$/
   (system "mkdir #{app_path}/config") unless File.directory?("#{app_path}/config")
-  (system "mkdir #{app_path}/images") unless File.directory?("#{app_path}/images")
-  (system "mkdir #{app_path}/javascripts") unless File.directory?("#{app_path}/javascripts")
-  (system "mkdir #{app_path}/css") unless File.directory?("#{app_path}/css")
   system "touch #{config_file}"
   if File.read(config_file).length<=0
     File.open(config_file, 'w') do |f|
@@ -66,9 +63,9 @@ if ARGV[0] =~ /^upload$/
     exit
   end
 
-  AutoAliCDN::Oss.oss_upload(config_file, app_path)
+  AutoAliCDN::Oss.oss_upload(config_file, app_path, ARGV[1], ARGV[2], ARGV[3])
 end
 
-if ARGV[0] =~ /^debug$/
-  AutoAliCDN::Oss.oss_debug(config_file, app_path)
-end
+if ARGV[0] =~ /^download$/
+  AutoAliCDN::Oss.oss_download(config_file, app_path, ARGV[1] , ARGV[2])
+end

data/lib/auto-ali-cdn/oss.rb

@@ -30,103 +30,37 @@ module AutoAliCDN
 
       puts bucket.name
       bucket.put_object(config.site_resource_path+"/.start.txt") { |stream| stream << '2cdn setup ok' }
-      bucket.put_object(config.site_resource_path+"/images/.start.png") { |stream| stream << '2cdn setup ok' }
-      bucket.put_object(config.site_resource_path+"/javascripts/.start.js") { |stream| stream << "console.log('start from here')" }
-      bucket.put_object(config.site_resource_path+"/css/.start.css") { |stream| stream << "body{padding:0;}" }
     end
 
-    #upload local files to server
-    def self.oss_upload(config_path, app_path,rename=false)
+    def self.oss_upload(config_path, app_path, local_file, remote_file, delete='false')
       config = oss_config(config_path)
-
-      images_path = app_path+'/images'
-      javascripts_path = app_path+'/javascripts'
-      css_path = app_path+'/css'
-
       bucket = bucket(config)
 
-      replace_res_path = ->(local_path, remote_path) do
-        Dir.foreach(app_path) do |f|
-          if f =~ /\.(html)|(htm)$/
-            remote_prefix = remote_path.gsub(/-\w{32}\.(gif|png|jpg|jpeg|css|js)$/, '')
-
-            file_content = File.read("#{app_path}/#{f}").gsub(local_path, remote_path)
-
-            file_content = file_content.gsub(Regexp.new(remote_prefix+'-\w{32}\.(gif|png|jpg|jpeg|css|js)'), remote_path)
-
-            File.open("#{app_path}/#{f}", "w") do |f2|
-              f2.puts file_content
-            end
-          end
-        end
-      end
-
-      #upload image javascripts css etc.
-      upload_c = ->(res_path) do
-        Dir.foreach(res_path) do |name|
-          next if name =~ /^(\.)|(\.\.)$/
-          file_path = res_path+"/#{name}"
-          file_md5 = Digest::MD5.hexdigest(File.read(file_path))
-          res_type = res_path.gsub(/^.*\//, '')
-          suffix = "."+name.split(/\./).last
-          new_name = rename ? name.gsub(/#{suffix}$/, "-#{file_md5}#{suffix}"): name
-          object_key = config.site_resource_path+"/#{Time.now.strftime("%F %H:%M")}/#{new_name}"
-          if bucket.object_exists?(object_key)
-            puts "#{name} --> #{object_key}".color(:dimgray)
-            replace_res_path.call(res_type+'/'+name, config.domain_name+'/'+object_key)
-          else
-            bucket.put_object(object_key, :file => file_path)
-            puts "#{name} --> #{object_key}".color(:green)
-            replace_res_path.call(res_type+'/'+name, config.domain_name+'/'+object_key)
-          end
+      object_key = config.site_resource_path+"/#{remote_file}"
+      if bucket.object_exists?(object_key)
+        puts "#{name} --> #{object_key}".color(:dimgray)
+      else
+        begin
+          bucket.put_object(object_key, :file => "#{app_path}/#{local_file}")
+          puts "#{name} --> #{object_key}".color(:green)
+          File.delete("#{app_path}/#{local_file}") if delete == 'true'
+        rescue Aliyun::OSS::CallbackError => e
+          puts "Callback failed: #{e.message}"
         end
       end
-
-      upload_c.call(images_path)
-      upload_c.call(javascripts_path)
-      upload_c.call(css_path)
     end
 
-    def self.oss_debug(config_path, app_path)
+    def self.oss_download(config_path, app_path, remote_file, local_file)
       config = oss_config(config_path)
 
-      images_path = app_path+'/images'
-      javascripts_path = app_path+'/javascripts'
-      css_path = app_path+'/css'
-
       bucket = bucket(config)
 
-      replace_res_path = ->(remote_path, local_path) do
-        Dir.foreach(app_path) do |f|
-          if f =~ /\.(html)|(htm)$/
-
-            file_content = File.read("#{app_path}/#{f}").gsub(remote_path, local_path)
-
-            File.open("#{app_path}/#{f}", "w") do |f2|
-              f2.puts file_content
-            end
-          end
-        end
-      end
-
-      debug_c = ->(res_path) do
-        Dir.foreach(res_path) do |name|
-          next if name =~ /^(\.)|(\.\.)$/
-          file_path = res_path+"/#{name}"
-          file_md5 = Digest::MD5.hexdigest(File.read(file_path))
-          res_type = res_path.gsub(/^.*\//, '')
-          suffix = "."+name.split(/\./).last
-          object_key = config.site_resource_path+"/#{res_type}/#{name.gsub(/#{suffix}$/, "-#{file_md5}#{suffix}")}"
-          if bucket.object_exists?(object_key)
-            replace_res_path.call(config.domain_name+'/'+object_key, res_type+'/'+name)
-            puts "#{object_key.color(:red)} --> #{"#{res_type}/#{name}".color(:cyan)}"
-          end
-        end
+      object_key = config.site_resource_path+"/#{remote_file}"
+      if bucket.object_exists?(object_key)
+        bucket.get_object(object_key, :file =>  "#{app_path}/#{local_file}")
+        puts "#{object_key} --> #{app_path}/#{local_file}".color(:cyan)
       end
 
-      debug_c.call(images_path)
-      debug_c.call(javascripts_path)
-      debug_c.call(css_path)
     end
 
   end

data/lib/auto-ali-cdn/version.rb

@@ -1,3 +1,3 @@
 module AutoAliCDN
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 2cdn
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - liuxi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler