chronicler 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5c6897edb863ebbc3182d2b256a6c26d7d6763a
-  data.tar.gz: a31860fa336b1002d751ecb8df6ae2834a529c6e
+  metadata.gz: 4601aca82d7b4e20ca7de0be13a4b5f3bc328eee
+  data.tar.gz: e87071d55ee8ff46c2715753dee4c5aca53934ae
 SHA512:
-  metadata.gz: 4261895f88d52900c8e451eee93b04d40dfdf6feb30dfc889b95f75c41e087be53051e48abd47de3765e12753158d0070963866844f5700bfe2b1204e60778ba
-  data.tar.gz: 90758496816f9b8516406ad909cb4dd138b00d50ec3a9191e9b322966a1fe7b9dff7c36862731f0570992626850278897ca8a2b75c86bb936d93e7532201ff10
+  metadata.gz: f7303884259d535ed74400f20b57cd9110419e22343f9f97f79a0b17876fd948144c89ca8035aaca03a036a7d961f218df009ccf669e1c155be4d449c7eb96b2
+  data.tar.gz: 2b2a631baec969a1ae3e4c360d91f723e678530b6f4421310f04ecece9cb8263a3a4e8b54e45e607286981d6b26375bd7f49427f9c50ec4d3e25e555d9a7aa33

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+## Chronicler CHANGELOG
+
+### Version 0.1.2 (March 14, 2016)
+
+* Fixed creating gzipped database dumps
+
+### Version 0.1.1 (March 4, 2016)
+
+* Being able to move a tag during commit
+* Improved `crn use`
+* Being able to (Git) reset the current branch using `crn reset`
+* Dumping tables separately ^^
+
+### Version 0.1.0 (March 3, 2016)
+
+* Initial release

data/README.md

@@ -1,4 +1,4 @@
-# Chronicler
+# Chronicler [![Gem](https://img.shields.io/gem/v/chronicler.svg)](https://rubygems.org/gems/chronicler) [![Gem](https://img.shields.io/gem/dt/chronicler.svg)](https://rubygems.org/gems/chronicler)
 
 Version control your (development) databases using Git
 
@@ -12,19 +12,20 @@ Run the following command to install `Chronicler`:
 
 Chronicler is a command-line-tool so for starters, you can print help instructions:
 
-    $ crn --help
+    $ crn help
     Commands:
       crn branch                 # List branches
       crn checkout [IDENTIFIER]  # Switch and load the specified branch or commit or tag (IDENTIFIER is optional)
-      crn commit                 # Commit current state of databases
+      crn commit                 # Commit current state of selected databases
       crn destroy                # Remove Chronicler entirely
       crn help [COMMAND]         # Describe available commands or one specific command
       crn init [NAME]            # Create a new repository (NAME defaults to current Git repository or current user)
       crn list                   # List repositories
+      crn load                   # Load database(s) of current commit
       crn log [INTERFACE]        # Show commit logs (INTERFACE is optional)
       crn new [BRANCH]           # Create a new branch (BRANCH defaults to current Git branch)
       crn open                   # Open current repository
-      crn reset                  # Reset database(s) to last commit
+      crn reset [COMMIT]         # Reset current branch to specified commit
       crn select                 # Select which databases to store
       crn status                 # Show current status
       crn tree                   # Print branch graph tree

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/chronicler.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+require File.expand_path("../lib/chronicler/version", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Paul Engel"]
@@ -12,7 +13,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "chronicler"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.0"
+  gem.version       = Chronicler::VERSION
+  gem.licenses      = ["MIT"]
 
   gem.add_dependency "thor"
   gem.add_dependency "toml-rb"

data/lib/chronicler/cli.rb

@@ -16,17 +16,26 @@ class Chronicler
 
     desc "use [NAME]", "Use existing repository (NAME is optional)"
     def use(name = nil)
-      name ||= begin
-        current = current_name
-        repositories = Chronicler.repositories - [current]
+      current = current_name
+      repositories = Chronicler.repositories - [current]
 
-        no_repository_available! if repositories.empty?
+      if name == current
+        puts "Already using Chronicler repository '#{name}'."
+        exit!
+      end
 
+      name ||= begin
+        no_repository_available! if repositories.empty?
         postfix = " (on #{current})" if repositories.include?(current)
         repositories[Ask.list("Which repository do you want to use?#{postfix}", repositories)]
       end
 
-      config_use name
+      unless repositories.include?(name)
+        puts "fatal: Chronicler repository '#{name}' does not exist."
+        exit!
+      end
+
+      config_use(name)
     end
 
     desc "open", "Open current repository"
@@ -68,13 +77,13 @@ class Chronicler
       else
         puts "Changes for commit:"
         puts
-        (changes[:added] || []).each do |(table, checksum)|
+        changes[:added].each do |(table, checksum)|
           puts "       added:  #{table}"
         end
-        (changes[:modified] || []).each do |(table, checksum)|
+        changes[:modified].each do |(table, checksum)|
           puts "    modified:  #{table} (#{checksum})"
         end
-        (changes[:deleted] || []).each do |(table, checksum)|
+        changes[:deleted].each do |(table, checksum)|
           puts "     deleted:  #{table}"
         end
         puts
@@ -117,30 +126,40 @@ class Chronicler
       end
       selected = options.collect{|database| repository_databases.include?(database)}
 
-      Ask.checkbox("Which databases would you like to store?", options, default: selected).each_with_index do |checked, index|
+      Ask.checkbox("Which database(s) would you like to store?", options, default: selected).each_with_index do |checked, index|
         databases << options[index] if checked
       end
 
       repository.select databases
     end
 
-    desc "commit", "Commit current state of databases"
+    desc "commit", "Commit current state of selected databases"
     method_options [:message, "-m"] => :string, [:tag, "-t"] => :string
     def commit
       if repository.new?
         select
-      elsif !repository.dirty?
-        puts "Nothing to commit."
-        return
+      else
+        unless repository.dirty?
+          puts "Nothing to commit."
+          exit!
+        end
+
+        if (tag = options[:tag]) && !repository.git("rev-parse #{tag}", :verbose).empty?
+          unless Ask.confirm("Tag '#{tag}' already exists. Do you want to move the tag?")
+            puts "fatal: Commit aborted."
+            exit!
+          end
+        end
       end
+
       message = options[:message] || "Updated databases"
-      repository.commit message, options[:tag]
+      repository.commit message, tag
     end
 
-    desc "reset", "Reset database(s) to last commit"
-    def reset
-      if repository && Ask.confirm("Are you sure you want to reset to the last commit? (Changes will be lost)")
-        repository.reset
+    desc "load", "Load database(s) of current commit"
+    def load
+      if Ask.confirm("Are you sure you want to load databases from the #{repository.name.blue}:#{Git.head(repository.path)[0..7].yellow} commit? (Changes will be LOST)")
+        repository.load
       end
     end
 
@@ -159,6 +178,13 @@ class Chronicler
       puts "Successfully loaded database#{"s" unless repository.databases.size == 1} of '#{identifier}'"
     end
 
+    desc "reset [COMMIT]", "Reset current branch to specified commit"
+    def reset(commit)
+      if Ask.confirm("Are you sure you want to reset #{repository.name}:#{repository.branch} to #{commit.yellow}?")
+        repository.reset(commit)
+      end
+    end
+
     desc "destroy", "Remove Chronicler entirely"
     def destroy
       if File.exists?(Chronicler.config_path)
@@ -228,7 +254,7 @@ class Chronicler
     end
 
     def method_missing(method, *args)
-      raise Error, "Unrecognized command \"#{method}\". Please consult `ds help`."
+      raise Error, "Unrecognized command \"#{method}\". Please consult `crn help`."
     end
 
   end

data/lib/chronicler/repository.rb

@@ -48,11 +48,15 @@ class Chronicler
       config[:"repository.checksums"] = checksums
       git "add ."
       git "commit -m #{message.inspect}"
-      git "tag #{tag}" if tag
+      git "tag -f #{tag}" if tag
     end
 
-    def reset
-      load
+    def load
+      databases.each do |database|
+        Dir[File.join(path, database, "*.sql.gz")].each do |gzip|
+          run "gunzip < #{gzip} | mysql -u root #{database}"
+        end
+      end
     end
 
     def checkout(branch)
@@ -60,6 +64,10 @@ class Chronicler
       load
     end
 
+    def reset(commit)
+      git "reset --hard #{commit}"
+    end
+
     def git(command, output = :silence)
       run "git #{command}", output
     end
@@ -95,7 +103,9 @@ class Chronicler
       modified = current.select{|table, checksum| stored.keys.include?(table) && (stored[table] != checksum)}
       deleted = stored.reject{|table, checksum| current.keys.include?(table)}
 
-      {}.tap do |changes|
+      Hash.new do |hash, key|
+        hash[key] = {}
+      end.tap do |changes|
         changes[:added] = added if added.any?
         changes[:modified] = modified if modified.any?
         changes[:deleted] = deleted if deleted.any?
@@ -121,22 +131,21 @@ class Chronicler
     end
 
     def dump
-      Dir[File.join(path, "*.sql.gz")].each do |file|
-        unless databases.include?(File.basename(file, ".sql.gz"))
-          File.delete(file)
-        end
-      end
+      changed = changes
 
-      changed = changes.values.flatten
-      changed_databases = changed.collect{|h| h.keys.collect{|t| t.gsub(/-.*/, "")}}.flatten.uniq
-      changed_databases.each do |database|
-        run "mysqldump -u root #{database} | gzip -c | cat > #{database}.sql.gz", true
+      changed[:deleted].each do |table, checksum|
+        File.delete File.join(path, "#{table.gsub("-", File::SEPARATOR)}.sql.gz")
+      end
+      changed[:added].merge(changed[:modified]).each do |table, checksum|
+        database, table = table.split("-")
+        FileUtils.mkdir_p File.join(path, database)
+        run "mysqldump -u root #{database} #{table} | gzip -c | cat > #{File.join(database, table)}.sql.gz", true
       end
-    end
 
-    def load
-      databases.each do |database|
-        run "gunzip < #{database}.sql.gz | mysql -u root #{database}", true
+      Dir[File.join(path, "*")].each do |file|
+        if File.directory?(file) && Dir["#{File.join(file, "*.sql.gz")}"].empty?
+          FileUtils.rm_rf file
+        end
       end
     end
 

data/lib/chronicler/version.rb

@@ -0,0 +1,7 @@
+class Chronicler
+  MAJOR = 0
+  MINOR = 1
+  TINY  = 2
+
+  VERSION = [MAJOR, MINOR, TINY].join(".")
+end

data/lib/chronicler.rb

@@ -4,6 +4,7 @@ require "chronicler/core_ext"
 require "chronicler/config"
 require "chronicler/git"
 require "chronicler/repository"
+require "chronicler/version"
 
 class Chronicler
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chronicler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -89,8 +90,10 @@ files:
 - lib/chronicler/core_ext/string.rb
 - lib/chronicler/git.rb
 - lib/chronicler/repository.rb
+- lib/chronicler/version.rb
 homepage: https://github.com/archan937/chronicler
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []