imba 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: bd680e374b7adf954363d9a63828cc7b638dee0c
-  data.tar.gz: 7f49bcb6f01f8430670b1461967a28474824c846
+  metadata.gz: d46dce5c9679657e961bfb660b18661c9a45e146
+  data.tar.gz: 04b2ed0090f31ead4f8bef3a211c7036c4de4034
 SHA512:
-  metadata.gz: 6696504a63e52038ad7b7877afd0a4f9da24f1e28c9d1b8ab69fd2c2828028cee9240a289cd03f61ee4a6d0f9dc90c12bc5c2f408041dd331e617d71d53a728a
-  data.tar.gz: aba298d79aa8d819122eed1d61e4e6a0c13359825938ee90150bea59320706124eb64ae09f86e030c85e20b710d5cda40787fc5e868b1d60d9ed58b28ddbcabf
+  metadata.gz: ae8243cc64ffc7fd59df8bde92e3bdac4b24b5d2346622fb7c56da27ab6b3742a017fbe4e7021e58dce2bf1ed0d9c7f481c8339e62fed303fec402fed37ee9ce
+  data.tar.gz: 0fcea6c4f8c47860980bf2c31676ecee1faed54cd982edca030bbb11aa2188983901979aaff7430d0120194c85ab0ff73f47007e79c9a1b4c27d11703e578d64

data/.gitignore

@@ -15,4 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.imba/*
+.imba/*
+*.log
+*.sqlite3

data/README.md

@@ -5,21 +5,33 @@
 
 ## Todo:
 
+- [x] build a mess and refactor later :)
 - [x] init .imba-store
 - [x] persistence datastore
 - [x] sync: get current directory list (movie names)
-- [ ] rescue ".imba does not exist (PStore::Error)"
-- [ ] place names in queue w/o .imba-meta
-- [ ] pop movie and search imdb
-- [ ] get first item
 - [x] ask for updating movie
-- [x] rename file
-- [ ] place .imba-meta file with id, title, genre, rating, year
-- [ ] write .imba-meta into imba-store
+- [x] rename directory
+- [x] cleanup movie titles, remove crap like (I)
+- [x] synching stuff with progressbar (downloading all the movies)
+- [x] refactor to use active_record instead of datastore for movies
+- [ ] underscore all the symbols
+- [ ] catch errors in cli
+- [ ] get/send different name when false match
+- [ ] add possibility to update
+- [ ] what's up with folders which were deleted but are still in the db?
+- [ ] add tags to handle genres
+- [ ] database cleaner
+- [ ] fix utf-8 issues
 - [ ] list movies by rating | genre | etc
 - [ ] print imba-store
-- [ ] play movie # on ATV
 - [ ] maybe document code with yard
+- [ ] decouple movie (objectify representation)
+- [ ] play movie # on ATV (at least open folder or send to vlc)
+
+
+## Impression
+
+![example](/screens/example.png)
 
 
 ## Installation

data/Rakefile

@@ -1,5 +1,8 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'active_record'
+require 'yaml'
+require 'logger'
 
 RSpec::Core::RakeTask.new(:spec)
 
@@ -10,3 +13,13 @@ task check: :spec do
   system 'rubocop'
   system 'flog lib'
 end
+
+desc 'migrate database'
+task migrate: :environment do
+  ActiveRecord::Migrator.migrate('db/migrate', ENV['VERSION'] ? ENV['VERSION'].to_i : nil)
+end
+
+task :environment do
+  ActiveRecord::Base.establish_connection(YAML.load(File.open('db/database.yml')))
+  ActiveRecord::Base.logger = Logger.new(File.open('db/database.log', 'a'))
+end

data/db/database.yml

@@ -0,0 +1,4 @@
+adapter: sqlite3
+database: db/data.sqlite3
+pool: 5
+timeout: 5000

data/db/migrate/001_create_movies.rb

@@ -0,0 +1,15 @@
+class CreateMovies < ActiveRecord::Migration
+  def self.up
+    create_table :movies do |t|
+      t.integer :uniq_id
+      t.string :name
+      t.string :year
+      t.text :genres
+      t.float :rating
+    end
+  end
+
+  def self.down
+    drop_table :movies
+  end
+end

data/imba.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 2.14.1'
   spec.add_development_dependency 'rspec-pride', '~> 2.2.0'
+  spec.add_development_dependency 'database_cleaner', '~> 1.2.0'
   spec.add_development_dependency 'guard-rspec', '~> 4.2.3'
   spec.add_development_dependency 'pry', '~> 0.9.12.4'
   spec.add_development_dependency 'pry-rescue', '~> 1.2.0'
@@ -31,4 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'flog'
 
   spec.add_runtime_dependency 'imdb', '~> 0.8.0'
+  spec.add_runtime_dependency 'activerecord', '~> 4.0.1'
+  spec.add_runtime_dependency 'sqlite3', '~> 1.3.8'
+  spec.add_runtime_dependency 'ruby-progressbar', '~> 1.4.0'
 end

data/lib/imba.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+require 'active_record'
+require 'yaml'
 require 'imba/version'
 require 'imba/cli'
 require 'imba/colors'
@@ -9,4 +12,11 @@ require 'imdb'
 module Imba
   PATH ||= Dir.pwd
   DIRECTORY = "#{PATH}/.imba"
+
+  ActiveRecord::Base.establish_connection(
+    adapter: 'sqlite3',
+    database: "#{DIRECTORY}/data.sqlite3",
+    pool: 5,
+    timeout: 5000
+  )
 end

data/lib/imba/cli.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'optparse'
 
 module Imba
@@ -14,6 +15,7 @@ module Imba
           else
             "#{PATH}/.imba".tap { |dir| FileUtils.mkdir_p(dir) }
             Imba::DataStore.init
+            Imba::DataStore.migrate
           end
           exit
         end
@@ -28,6 +30,16 @@ module Imba
           exit
         end
 
+        opts.on('-s', '--synch', 'Scan movies and update database') do
+          Imba::MovieList.new.synch
+          exit
+        end
+
+        opts.on('-l', '--list', 'List all your movies') do
+          stdout.puts Imba::Movie.list
+          exit
+        end
+
         opts.on('-v', '--version', 'Show current version') do
           stdout.puts "IMBA #{Imba::VERSION}"
           exit
@@ -38,7 +50,7 @@ module Imba
           exit
         end
 
-        opts.on('-e', 'execute raw ruby in the "Imba::*" scope') do
+        opts.on('-e', 'execute raw ruby in the "Imba::*" scope (just for dev purpose, will be removed soon!)') do
           stdout.puts eval("Imba::#{argv[0]}")
           exit
         end

data/lib/imba/data_store.rb

@@ -1,82 +1,26 @@
-require 'pstore'
-
 module Imba
   module DataStore
     class << self
-      attr_reader :data
-      attr_writer :path
-
       def init
-        @data = PStore.new(path, true)
-        @data.ultra_safe = true
-        @data.transaction { @data.commit }
-        @data
-      end
-
-      def path
-        @path ||= "#{Imba::DIRECTORY}/data.pstore"
-      end
-
-      def data_store
-        data || init
-      end
-
-      def [](key)
-        data_store.transaction(true) { @data[key] }
-      end
-
-      def []=(key, value)
-        data_store.transaction { @data[key] = value }
-      end
-
-      def all
-        data_store.transaction(true) { @data.roots }
-      end
-
-      def to_hash
-        Imba::DataStore.all.each_with_object({}) { |id, hsh| hsh[id] = Imba::DataStore[id] }
-      end
-
-      def to_a
-        Imba::DataStore.all.each_with_object([]) { |id, ary| ary << "#{id}: #{Imba::DataStore[id]}" }
-      end
-
-      def transaction
-        data_store.transaction do
-          yield @data
-          @data.commit
-        end
-      end
-
-      def key?(key)
-        data_store.transaction(true) { @data.root?(key) }
-      end
-
-      def delete(*keys)
-        data_store.transaction do
-          keys.flatten.each { |key| @data.delete(key) }
-          @data.commit
+        ActiveRecord::Base.establish_connection(
+          adapter: 'sqlite3',
+          database: "#{DIRECTORY}/data.sqlite3",
+          pool: 5,
+          timeout: 5000
+        )
+      end
+
+      def migrate
+        ActiveRecord::Schema.define do
+          create_table :movies do |t|
+            t.integer :uniq_id
+            t.string :name
+            t.string :year
+            t.text :genres
+            t.float :rating
+          end
         end
       end
-
-      def clear
-        delete(all)
-      end
-
-      def inspect
-        data_store
-        "#<#{name}:#{ruby_like_object_id} #{instance_vars}>"
-      end
-
-      private
-
-      def ruby_like_object_id
-        "0x#{(object_id << 1).to_s(16)}"
-      end
-
-      def instance_vars
-        instance_variables.map { |v| "#{v}=#{instance_variable_get(v).inspect}" }.join(', ')
-      end
     end
   end
 end

data/lib/imba/movie.rb

@@ -1,7 +1,24 @@
 module Imba
-  class Movie
-    def self.all
-      Imba::DataStore[:movies] || []
+  class Movie < ActiveRecord::Base
+    include Colors
+    serialize :genres, Array
+
+    scope :list, -> { order(name: :asc) }
+    scope :top, ->(n = 25) { order(rating: :desc).limit(n) }
+    scope :year, ->(year = Time.now.year) { where(year: year) }
+    scope :genre, ->(genre = nil) { where('genres LIKE ?', "%#{genre}%") }
+
+    def to_s
+      terminal_width = `tput cols`
+      column = terminal_width.to_i / 2
+
+      ''.tap do |s|
+        s << "#{sprintf('%-9s', uniq_id)} #{green(name)}".ljust(column)
+        s << ' ' + magenta("(#{year})")
+        s << ' ' + red("#{rating}/10")
+        s << ' ' + yellow(genres)
+        s.rjust(column)
+      end
     end
   end
 end

data/lib/imba/movie_list.rb

@@ -1,52 +1,83 @@
+# encoding: utf-8
+require 'thread'
+require 'ruby-progressbar'
+
 module Imba
   class MovieList
     include Colors
     attr_reader :movies
+    attr_accessor :directory_queue, :movie_queue
+
+    Diff = Struct.new(:directory_name, :movie_title, :result)
 
     def initialize
       @movies = Movie.all
+      @directory_queue = Queue.new
+      @movie_queue = Queue.new
     end
 
     def movie_dirs
-      # don't belong here...
-      # get movie names (dirs)
       @movie_dirs ||= Dir['*'].select { |f| File.directory? f }
     end
 
-    def add
-      Imba::DataStore[:movies] = movie_dirs
-    end
-    # @movie_dirs.each { |d| FileUtils.cd(d) { FileUtils.touch ".hello" } }
-
+    #
+    # TODO: make it work first, refactor later (for even more fun!)
+    #
     def synch
       prompt = '(enter "y" to confirm or anything else to continue)'
-      # for each movie
+      indexed_movies = Movie.pluck(:uniq_id)
+      p = ProgressBar.create(title: 'Scanning your movies', total: movie_dirs.length)
+      skipped = []
+
+      # populate queue
       movie_dirs.each do |directory_name|
-        # check movie name on imdb
-        result = Imdb::Movie.search(directory_name).first # needs rescue?
-        movie_title = result.title.gsub(/\(\d+\)/, '').strip
-        movie = "#{movie_title} (#{result.year}) #{result.genres} #{result.rating}/10"
+        FileUtils.cd(directory_name) do
+          if File.exist?('.imba') && File.open('.imba') { |f| indexed_movies.include?(f.read.to_i) }
+            skipped << directory_name
+            p.increment
+          else
+            directory_queue.push(directory_name)
+          end
+        end
+      end
+
+      # download all the movies
+      until directory_queue.empty?
+        directory_name = directory_queue.pop
+        result = Imdb::Movie.search(directory_name).first
+        movie_title = result.title.gsub(/\(\d+\)|\(.*\)/, '').strip.force_encoding('UTF-8')
+        movie_queue.push Diff.new(directory_name, movie_title, result)
+        p.increment
+      end
 
-        # puts foundings
+      # puts foundings
+      until movie_queue.empty?
+        diff = movie_queue.pop
         # update movie name? (folder)
-        if directory_name != movie_title
-          puts "change #{red(directory_name)} => #{green(movie_title)}? \n#{prompt}"
-          FileUtils.mv(directory_name, movie_title) if STDIN.gets.strip.downcase == 'y'
+        if diff.directory_name != diff.movie_title
+          STDOUT.puts "change #{red(diff.directory_name)} => #{green(diff.movie_title)}? \n#{prompt}"
+          FileUtils.mv(diff.directory_name, movie_title) if STDIN.gets.strip.downcase == 'y'
         end
 
-        if Imba::DataStore.key?(result.id) && Imba::DataStore[result.id] != movie
-          puts "update?\n- #{red(Imba::DataStore[result.id])} \n+ #{green(movie)} \n#{prompt}"
-          Imba::DataStore[result.id] = movie if STDIN.gets.strip.downcase == 'y'
-        else
-          Imba::DataStore[result.id] = movie
+        # create movie from result
+        STDOUT.puts "save #{green(diff.movie_title)}? \n#{prompt}"
+        if STDIN.gets.strip.downcase == 'y'
+          movie = Movie.create(
+            uniq_id: diff.result.id,
+            name: diff.movie_title,
+            year: diff.result.year,
+            genres: diff.result.genres.map { |g| g.downcase.to_sym },
+            rating: Float(diff.result.rating)
+          )
+          FileUtils.cd(diff.movie_title) do
+            File.open('.imba', 'w+') { |f| f.write(movie.uniq_id) }
+          end
+          STDOUT.puts cyan("#{movie.to_s}\n")
         end
-
-        # ask if founding is correct
-        # write .imdb_uniq_id in movie folder
-        # save movie name and imdb_uniq_id in DataStore[:movies]
-        # or serialize hole imdb movie object?!
       end
-      STDOUT.puts 'done'
+
+      skipped.each { |skip| STDOUT.puts yellow("skipped: #{skip}") }
+      STDOUT.puts "\ndone"
     end
   end
 end

data/lib/imba/version.rb

@@ -1,3 +1,3 @@
 module Imba
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/data_store_spec.rb

@@ -3,46 +3,5 @@ require 'spec_helper'
 module Imba
   describe DataStore do
 
-    describe '#inspect' do
-      subject { Imba::DataStore.inspect }
-      it { expect(subject).to include('#<Imba::DataStore:0x') }
-      it { expect(subject).to include(Imba::DataStore.path) }
-      it { expect(subject).to include('/tmp/.imba_test/test_data.pstore') }
-      it { expect(subject).to include('@data=#<PStore:') }
-      it { expect(subject).to include('@ultra_safe=true') }
-      it { expect(subject).to include('@thread_safe=true') }
-      it { expect(subject).to include('@table={}') }
-    end
-
-    describe 'read/write something in/from the data store' do
-      before { Imba::DataStore[:something] = { foo: 'bar' } }
-      it { expect(Imba::DataStore[:something]).to eql(foo: 'bar') }
-      it { expect(Imba::DataStore.all).to eql([:something]) }
-      it { expect(Imba::DataStore.key?(:something)).to be_true }
-    end
-
-    describe 'delete something from the data store' do
-      before do
-        Imba::DataStore[:stay_my_friend] = { foo: 'bar' }
-        Imba::DataStore[:delete_me] = 'can\'t wait'
-        Imba::DataStore.delete(:delete_me)
-      end
-      it { expect(Imba::DataStore.key?(:delete_me)).to be_false }
-      it { expect(Imba::DataStore.all).to eql([:stay_my_friend]) }
-    end
-
-    describe 'multi transactions' do
-      before do
-        Imba::DataStore.transaction do |data|
-          data[:number] = 42
-          data[:foo] = 'bar bazly'
-          data[:words] = %w[amazing stuff inside transaction]
-        end
-      end
-
-      it { expect(Imba::DataStore.all).to eql([:number, :foo, :words]) }
-      it { expect(Imba::DataStore[:words]).to eql(%w[amazing stuff inside transaction]) }
-    end
-
   end
 end

data/spec/movie_list_spec.rb

@@ -2,13 +2,6 @@ require 'spec_helper'
 
 module Imba
   describe MovieList do
-#    it { binding.pry }
-
-    # movie_dirs = Dir['*'].select {|f| File.directory? f}
-    #
-    # require "find"
-    # imba_files = []
-    # Find.find(".") {|path| imba_files << path if path =~ /\.imba$/}
 
   end
 end

data/spec/movie_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 module Imba
   describe Movie do
-    it { expect(Movie.all).to eql([]) }
+    let!(:sneakers) { Movie.create(name: 'Sneakers', uniq_id: 1, year: 2012, genres: [:foo, :hackers], rating: 7.0) }
+    let!(:war_games) { Movie.create(name: 'War Games', uniq_id: 2, year: 2012, genres: [:foo, :war], rating: 8.0) }
+    let!(:tron) { Movie.create(name: 'Tron: Legacy', uniq_id: 3, year: 2012, genres: [:foo, :tron], rating: 9.0) }
+
+    it { expect(Movie.list).to match_array([sneakers, tron, war_games]) }
+    it { expect(Movie.top(5).first).to eql(tron) }
+    it { expect(Movie.top(5).last).to eql(sneakers) }
   end
 end

data/spec/spec_helper.rb

@@ -1,17 +1,34 @@
 require 'rspec/pride'
+require 'database_cleaner'
 require 'pry'
 require_relative '../lib/imba'
 
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ":memory:")
+
 RSpec.configure do |config|
   config.color = true
   config.order = 'random'
 
-  config.before(:all) do
-    FileUtils.mkdir_p("../tmp/.imba_test")
-    Imba::DataStore.path = "../tmp/.imba_test/test_data.pstore"
-    Imba::DataStore.init
+  config.before(:suite) do
+    ActiveRecord::Schema.define do
+      self.verbose = false
+      create_table :movies, force: true do |t|
+        t.integer :uniq_id
+        t.string :name
+        t.string :year
+        t.text :genres
+        t.float :rating
+      end
+    end
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
   end
 
-  config.before(:each) { Imba::DataStore.clear }
-  config.after(:all) { Imba::DataStore.clear }
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imba
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Marco Schaden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,48 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.8
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 description: With Imba you can manage your movies by meta information (like rating,
   genre, year) from IMDB.
 email:
@@ -183,6 +239,8 @@ files:
 - README.md
 - Rakefile
 - bin/imba
+- db/database.yml
+- db/migrate/001_create_movies.rb
 - imba.gemspec
 - lib/imba.rb
 - lib/imba/cli.rb
@@ -191,6 +249,7 @@ files:
 - lib/imba/movie.rb
 - lib/imba/movie_list.rb
 - lib/imba/version.rb
+- screens/example.png
 - spec/data_store_spec.rb
 - spec/imba_spec.rb
 - spec/movie_list_spec.rb