github_snapshot 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmFmYmRjOTU2ZDRkZjhjMGUyNjIwZTFjZDA2NjViNWU3YWVlNDYxZQ==
+    ZWY1MjE0YmZmMjRjZjBlOWQ1OTA4YmRkOTc4OWE1MjliNWYzZDMzOA==
   data.tar.gz: !binary |-
-    N2Q5NGVmNDEzZmEwODJiM2Y3ZTM2MTEyYzgwMzlhZDFlNzY1YTRiZA==
-!binary "U0hBNTEy":
+    NjJjNDZmMDdiNzk0M2M1NTA1NjI5NzA3MTA4OTBjZDc0Mjk1ZTE4ZA==
+SHA512:
   metadata.gz: !binary |-
-    ODgyYTg5MGIwODA3YmU3ODljZDA1ODExNzhmOGI1YmRlOGFiYjcxNzJkMDg5
-    ZDU5NzU3YWZiMmJhZGFjNmFmOWYzODQ4Mzc5NjQ3MWZiN2E2ZWE0MWJjNDFi
-    NzUwMzRhMTQzMjU3ZGFhYTUwMmRlNjU1NTAwZjQ0NjU0NjdjNDI=
+    YzZmOTk3YWJhMWE5ODIwMjZiODAwYmYzODk0OTJmODAzN2EyMmM5OTdjNDRk
+    NjI2YWNjMjE3MzI2M2YxZDA5MmE3YTQwMzIzMzEyMWY3YjVkN2QxMjBhZTA3
+    YzdhYjRlY2Q0YjFlY2Q2MjI5NzYyZTNjZGJlOTQwNDRhZTZmYzA=
   data.tar.gz: !binary |-
-    M2EzMzgwOGM0MDU4NzVlOTFhNjM3ODA3MzhkMjMwOGM5NDFlMWU3NjU5Yzdk
-    ODMxYjlhNDc1Yzk1ZWNlY2FhZWVkNTFkNDk5NTAyZGQyZTU3Y2QyMTYyMmE3
-    MmQ5MGM4OTUxNmQxN2QwMzNlMGNhOWU2OWQzZDM2NTE3ZTc2NjY=
+    NTBkZDc2MzFmNDQ1NDZlNDY5MDU1NzFkOTRhOWVlOGUwOGEyYjU3NjE5MDVm
+    MDA1YTc4MzQ1ZjYyNTM5NzIxYWY4NzkxYTdjYWQyMjMxMzhlZTBlMjgzYjVk
+    MWExZWUyYjA1YjAyN2Q2NWQzMzNlZjMzNjMzYjljMjYzZTE0ZDM=

data/lib/github_snapshot.rb

@@ -1,5 +1,4 @@
 require "github_snapshot/snapshot"
 
 module GithubSnapshot
-  # Your code goes here...
 end

data/lib/github_snapshot/repository.rb

@@ -24,30 +24,30 @@ module GithubSnapshot
     end
 
     def has_wiki?
-      Open3.capture3("git ls-remote #{wiki_ssh_url}")[1].empty? && gh_has_wiki
+      Open3.capture3("git ls-remote #{@wiki_ssh_url}")[1].empty? && @gh_has_wiki
     end
 
     def backup
-      GithubSnapshot.logger.info "#{canonical_name} - backing up"
+      GithubSnapshot.logger.info "#{@canonical_name} - backing up"
 
       # Go to next repo if the repository is empty
-      unless pushed_at
-        GithubSnapshot.logger.info "#{canonical_name} is empty"
+      unless @pushed_at
+        GithubSnapshot.logger.info "#{@canonical_name} is empty"
         return nil
       end
 
+      Dir.chdir "#{@organization.name}"
       begin
-        Dir.chdir "#{organization.name}"
         clone
-        clone_wiki if self.has_wiki?
+        clone_wiki if has_wiki?
         prune_old_backups
-        Dir.chdir ".."
       rescue GithubSnapshot::Error
-        GithubSnapshot.logger.error "#{canonical_name} - skipping due to error"
+        GithubSnapshot.logger.error "#{@canonical_name} - skipping due to error"
         return nil
       end
+      Dir.chdir ".."
 
-      GithubSnapshot.logger.info "#{canonical_name} - success"
+      GithubSnapshot.logger.info "#{@canonical_name} - success"
     end
 
   private
@@ -59,34 +59,34 @@ module GithubSnapshot
       # Timeout to make sure the script doesn't hang
       begin
         Timeout::timeout (GithubSnapshot.git_clone_timeout) {
-          GithubSnapshot.exec "#{GithubSnapshot.git_clone_cmd} #{ssh_url} #{folder}"
+          GithubSnapshot.exec "#{GithubSnapshot.git_clone_cmd} #{@ssh_url} #{@folder}"
         }
       rescue Timeout::Error, Utilities::ExecError => e
         message = e.class == Timeout::Error ? 'timedout' : 'exec error'
-        GithubSnapshot.logger.error "Could not clone #{canonical_name}, #{message}"
+        GithubSnapshot.logger.error "Could not clone #{@canonical_name}, #{message}"
         raise GithubSnapshot::Error
       end
 
-      Utilities.tar "#{folder}", GithubSnapshot.logger
-      GithubSnapshot.exec "rm -rf #{folder}"
+      Utilities.tar "#{@folder}", GithubSnapshot.logger
+      GithubSnapshot.exec "rm -rf #{@folder}"
     end
 
     def clone_wiki
-      GithubSnapshot.logger.info "#{canonical_name} - cloning wiki"
-      GithubSnapshot.exec "#{GithubSnapshot.git_clone_cmd} #{wiki_ssh_url} #{wiki_folder}"
-      Utilities.tar "#{wiki_folder}", GithubSnapshot.logger
-      GithubSnapshot.exec "rm -rf #{wiki_folder}"
+      GithubSnapshot.logger.info "#{@canonical_name} - cloning wiki"
+      GithubSnapshot.exec "#{GithubSnapshot.git_clone_cmd} #{@wiki_ssh_url} #{@wiki_folder}"
+      Utilities.tar "#{@wiki_folder}", GithubSnapshot.logger
+      GithubSnapshot.exec "rm -rf #{@wiki_folder}"
     end
 
     def prune_old_backups
-      GithubSnapshot.logger.info "#{canonical_name} - pruning old backups"
-      file_regex  = "#{name}-GST-*"
+      GithubSnapshot.logger.info "#{@canonical_name} - pruning old backups"
+      file_regex  = "#{@name}-GST-*tar.gz"
       zipped_bkps = FileList[file_regex].exclude(/wiki/)
       zipped_bkps.sort[0..-(GithubSnapshot.releases_to_keep + 1)].each do |file|
         File.delete file
       end if zipped_bkps.length > GithubSnapshot.releases_to_keep
 
-      wiki_regex   = "#{name}-GST-*wiki*"
+      wiki_regex   = "#{@name}-GST-*wiki*"
       zipped_wikis = FileList[wiki_regex]
       zipped_wikis.sort[0..-(GithubSnapshot.releases_to_keep + 1)].each do |file|
         File.delete file

data/lib/github_snapshot/snapshot.rb

@@ -72,7 +72,7 @@ module GithubSnapshot
     def download_from_s3
       GithubSnapshot.logger.info "downloading fom s3"
       begin
-        GithubSnapshot.exec "s3cmd sync --delete-removed s3://#{s3_bucket}/ #{backup_folder}/"
+        GithubSnapshot.exec "s3cmd sync --delete-removed --skip-existing s3://#{s3_bucket}/ #{backup_folder}/"
       rescue Utilities::ExecError
         GithubSnapshot.logger.info "s3cmd doesn't respect exit status\n"\
                                    "there is a good chance that the sync was successful"
@@ -93,7 +93,7 @@ module GithubSnapshot
 
     def upload_to_s3
       GithubSnapshot.logger.info "uploading to s3"
-      GithubSnapshot.exec "s3cmd sync --delete-removed #{backup_folder}/ s3://#{s3_bucket}/"
+      GithubSnapshot.exec "s3cmd sync --delete-removed --skip-existing #{backup_folder}/ s3://#{s3_bucket}/"
     end
 
   end

data/lib/github_snapshot/version.rb

@@ -1,3 +1,3 @@
 module GithubSnapshot
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github_snapshot
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Artur Rodrigues
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Snapshots Github repositories