kindle 0.7.0.beta3 → 0.7.0.beta4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/kindle.rb +1 -1
  3. data/lib/kindle/cli.rb +2 -1
  4. data/lib/kindle/migrations/initializer.rb +0 -2
  5. data/lib/kindle/settings.rb +30 -28
  6. data/resources/kindle.png +0 -0
  7. metadata +2 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bc23a0543424ca1399d06be961e07329ee84d0c2
4
- data.tar.gz: 8e82b9a199c2af224aa6df867094c47459eec6ed
3
+ metadata.gz: 9e64a9999470ffa1f6f2c273cfaeda18e9c82382
4
+ data.tar.gz: 0c5d32439552adc59a278080ef5ca948674a33cb
5
5
  SHA512:
6
- metadata.gz: fae81d80ca0843547f36babea5e6d3f96ef6b201cd5758d403fab54a33e9cc3f5e394be87eae6c79f6d747cccfff2ed110afe0d21e67a0887aa408a5f263610d
7
- data.tar.gz: 5f2df425ce3578e41a2f8be847c4d6e65664028d92c06658586366b08d1cef45aa65d6c14b0327d7adaee40322b73551d940132a9013c0fc2ec4ab1836f51f87
6
+ metadata.gz: 1270f7661677fa773541a449a6b9e19c9cd1b325ec626f4217e1ab03ff30a80d32ddf65b978c021d958470f9567da0f73e9d4da21a2a6c9ca952168f5b7d488d
7
+ data.tar.gz: 651897893f6f162a4f04a6394bb689b63fa92173a9acd89363a15b8760979331d0bb9d09f72528eece5e83f9b62cc352429fdea826d0cf8dd2556f5f84dcc524
data/lib/kindle.rb CHANGED
@@ -16,6 +16,6 @@ require_relative "kindle/exports/csv"
16
16
  ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: Kindle::Settings::KINDLE_DATABASE_FILENAME)
17
17
 
18
18
  module Kindle
19
- VERSION = "0.7.0.beta3"
19
+ VERSION = "0.7.0.beta4"
20
20
  include Models
21
21
  end
data/lib/kindle/cli.rb CHANGED
@@ -41,7 +41,8 @@ module Kindle
41
41
  begin
42
42
  puts Rainbow("\nInitializing the database...").green
43
43
  Kindle::Migrations::Initializer.new
44
- rescue ActiveRecord::StatementInvalid
44
+ rescue ActiveRecord::StatementInvalid => ex
45
+ puts ex
45
46
  puts Rainbow("Looks like the database is already created, skipping...").red
46
47
  end
47
48
  end
data/lib/kindle/migrations/initializer.rb CHANGED
@@ -4,8 +4,6 @@ module Kindle
4
4
  module Migrations
5
5
  class Initializer
6
6
  def initialize
7
- # ActiveRecord::Base.configurations = YAML::load(IO.read(ENV['HOME']+'/.kindle/database.yml'))
8
- # ActiveRecord::Base.establish_connection("development")
9
7
  CreateBaseStructure.migrate(:up)
10
8
  end
11
9
  end
data/lib/kindle/settings.rb CHANGED
@@ -3,16 +3,19 @@ module Kindle
3
3
 
4
4
  KINDLE_SETTINGS_DIRECTORY = "#{ENV["HOME"]}/.kindle"
5
5
  KINDLE_SETTINGS_FILENAME = "#{KINDLE_SETTINGS_DIRECTORY}/kindlerc.yml"
6
- KINDLE_DATABASE_FILENAME = "#{KINDLE_SETTINGS_DIRECTORY}/database.yml"
6
+ KINDLE_DATABASE_FILENAME = "#{KINDLE_SETTINGS_DIRECTORY}/kindle.db"
7
7
 
8
8
  attr_reader :settings
9
9
 
10
10
  def initialize
11
11
  create_default_settings_directory unless Dir.exists?(KINDLE_SETTINGS_DIRECTORY)
12
- create_default_files unless File.exists?(KINDLE_SETTINGS_FILENAME)
13
- @settings = YAML.load(File.open(KINDLE_SETTINGS_FILENAME).read) || {}
14
- settings.each do |name, value|
15
- set_variable(name.to_s, value)
12
+ if File.exists?(KINDLE_SETTINGS_FILENAME)
13
+ @settings = YAML.load(File.open(KINDLE_SETTINGS_FILENAME).read) || {}
14
+ settings.each do |name, value|
15
+ set_variable(name.to_s, value)
16
+ end
17
+ else
18
+ @settings = {}
16
19
  end
17
20
  end
18
21
 
@@ -30,30 +33,29 @@ module Kindle
30
33
  Dir.mkdir KINDLE_SETTINGS_DIRECTORY
31
34
  end
32
35
 
33
- def create_default_files
34
- create_default_database_settings
35
- end
36
-
37
- def create_default_database_settings
38
- File.open(KINDLE_SETTINGS_FILENAME, "w") {|f| f << default_database_settings }
39
- end
36
+ # def create_default_kindle_settings
37
+ # `touch #{KINDLE_SETTINGS_FILENAME}`
38
+ # end
40
39
 
41
- def default_database_settings
42
- # File.open("templates/database.yml").read
43
- <<~EOF
44
- production:
45
- adapter: sqlite3
46
- database: ~/.kindle/kindle.db
47
-
48
- development:
49
- adapter: sqlite3
50
- database: ~/.kindle/database-dev.sqlite
51
-
52
- test:
53
- adapter: sqlite3
54
- database: ~/.kindle/database-test.sqlite
55
- EOF
56
- end
40
+ # def create_default_database_settings
41
+ # File.open(KINDLE_DATABASE_FILENAME, "w") {|f| f << default_database_settings }
42
+ # end
43
+ #
44
+ # def default_database_settings
45
+ # <<~EOF
46
+ # production:
47
+ # adapter: sqlite3
48
+ # database: ~/.kindle/kindle.db
49
+ #
50
+ # development:
51
+ # adapter: sqlite3
52
+ # database: ~/.kindle/database-dev.sqlite
53
+ #
54
+ # test:
55
+ # adapter: sqlite3
56
+ # database: ~/.kindle/database-test.sqlite
57
+ # EOF
58
+ # end
57
59
 
58
60
  def set_variable(name, value)
59
61
  instance_variable_set("@#{name}", value)
data/resources/kindle.png ADDED
Binary file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kindle
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0.beta3
4
+ version: 0.7.0.beta4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matt Petty
@@ -143,6 +143,7 @@ files:
143
143
  - lib/kindle/remote/book.rb
144
144
  - lib/kindle/remote/highlight.rb
145
145
  - lib/kindle/settings.rb
146
+ - resources/kindle.png
146
147
  - test/cli_test.rb
147
148
  - test/highlights_test.rb
148
149
  - test/kindle_test.rb