kindle 0.7.0.beta3 → 0.7.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc23a0543424ca1399d06be961e07329ee84d0c2
-  data.tar.gz: 8e82b9a199c2af224aa6df867094c47459eec6ed
+  metadata.gz: 9e64a9999470ffa1f6f2c273cfaeda18e9c82382
+  data.tar.gz: 0c5d32439552adc59a278080ef5ca948674a33cb
 SHA512:
-  metadata.gz: fae81d80ca0843547f36babea5e6d3f96ef6b201cd5758d403fab54a33e9cc3f5e394be87eae6c79f6d747cccfff2ed110afe0d21e67a0887aa408a5f263610d
-  data.tar.gz: 5f2df425ce3578e41a2f8be847c4d6e65664028d92c06658586366b08d1cef45aa65d6c14b0327d7adaee40322b73551d940132a9013c0fc2ec4ab1836f51f87
+  metadata.gz: 1270f7661677fa773541a449a6b9e19c9cd1b325ec626f4217e1ab03ff30a80d32ddf65b978c021d958470f9567da0f73e9d4da21a2a6c9ca952168f5b7d488d
+  data.tar.gz: 651897893f6f162a4f04a6394bb689b63fa92173a9acd89363a15b8760979331d0bb9d09f72528eece5e83f9b62cc352429fdea826d0cf8dd2556f5f84dcc524

data/lib/kindle.rb

@@ -16,6 +16,6 @@ require_relative "kindle/exports/csv"
 ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: Kindle::Settings::KINDLE_DATABASE_FILENAME)
 
 module Kindle
-  VERSION = "0.7.0.beta3"
+  VERSION = "0.7.0.beta4"
   include Models
 end

data/lib/kindle/cli.rb

@@ -41,7 +41,8 @@ module Kindle
         begin
           puts Rainbow("\nInitializing the database...").green
           Kindle::Migrations::Initializer.new
-        rescue ActiveRecord::StatementInvalid
+        rescue ActiveRecord::StatementInvalid => ex
+          puts ex
           puts Rainbow("Looks like the database is already created, skipping...").red
         end
       end

data/lib/kindle/migrations/initializer.rb

@@ -4,8 +4,6 @@ module Kindle
   module Migrations
     class Initializer
       def initialize
-        # ActiveRecord::Base.configurations = YAML::load(IO.read(ENV['HOME']+'/.kindle/database.yml'))
-        # ActiveRecord::Base.establish_connection("development")
         CreateBaseStructure.migrate(:up)
       end
     end

data/lib/kindle/settings.rb

@@ -3,16 +3,19 @@ module Kindle
 
     KINDLE_SETTINGS_DIRECTORY = "#{ENV["HOME"]}/.kindle"
     KINDLE_SETTINGS_FILENAME  = "#{KINDLE_SETTINGS_DIRECTORY}/kindlerc.yml"
-    KINDLE_DATABASE_FILENAME  = "#{KINDLE_SETTINGS_DIRECTORY}/database.yml"
+    KINDLE_DATABASE_FILENAME  = "#{KINDLE_SETTINGS_DIRECTORY}/kindle.db"
 
     attr_reader :settings
 
     def initialize
       create_default_settings_directory unless Dir.exists?(KINDLE_SETTINGS_DIRECTORY)
-      create_default_files unless File.exists?(KINDLE_SETTINGS_FILENAME)
-      @settings = YAML.load(File.open(KINDLE_SETTINGS_FILENAME).read) || {}
-      settings.each do |name, value|
-        set_variable(name.to_s, value)
+      if  File.exists?(KINDLE_SETTINGS_FILENAME)
+        @settings = YAML.load(File.open(KINDLE_SETTINGS_FILENAME).read) || {}
+        settings.each do |name, value|
+          set_variable(name.to_s, value)
+        end
+      else
+        @settings = {}
       end
     end
 
@@ -30,30 +33,29 @@ module Kindle
       Dir.mkdir KINDLE_SETTINGS_DIRECTORY
     end
 
-    def create_default_files
-      create_default_database_settings
-    end
-
-    def create_default_database_settings
-      File.open(KINDLE_SETTINGS_FILENAME, "w") {|f| f << default_database_settings }
-    end
+    # def create_default_kindle_settings
+    #   `touch #{KINDLE_SETTINGS_FILENAME}`
+    # end
 
-    def default_database_settings
-      # File.open("templates/database.yml").read
-      <<~EOF
-      production:
-        adapter: sqlite3
-        database: ~/.kindle/kindle.db
-
-      development:
-        adapter: sqlite3
-        database: ~/.kindle/database-dev.sqlite
-
-      test:
-        adapter: sqlite3
-        database: ~/.kindle/database-test.sqlite
-      EOF
-    end
+    # def create_default_database_settings
+    #   File.open(KINDLE_DATABASE_FILENAME, "w") {|f| f << default_database_settings }
+    # end
+    #
+    # def default_database_settings
+    #   <<~EOF
+    #   production:
+    #     adapter: sqlite3
+    #     database: ~/.kindle/kindle.db
+    #
+    #   development:
+    #     adapter: sqlite3
+    #     database: ~/.kindle/database-dev.sqlite
+    #
+    #   test:
+    #     adapter: sqlite3
+    #     database: ~/.kindle/database-test.sqlite
+    #   EOF
+    # end
 
     def set_variable(name, value)
       instance_variable_set("@#{name}", value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kindle
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta3
+  version: 0.7.0.beta4
 platform: ruby
 authors:
 - Matt Petty
@@ -143,6 +143,7 @@ files:
 - lib/kindle/remote/book.rb
 - lib/kindle/remote/highlight.rb
 - lib/kindle/settings.rb
+- resources/kindle.png
 - test/cli_test.rb
 - test/highlights_test.rb
 - test/kindle_test.rb