moodwall 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8a87e2546ffca4136d0c4a9b8a4981ae58e6121d1c28c80e8ea50f016f355d9
-  data.tar.gz: e449ab812e1043ffb4f428d90380572307314873cac98614ecdb5c4d4b39c87a
+  metadata.gz: f9054fee489308683737f0cbeb2b2276598c7b3bed2b7067a90b7de4d0700782
+  data.tar.gz: 62c291f465fd0578bcfbba613228a5486966815b235e8a7af541e61aa5f80b15
 SHA512:
-  metadata.gz: 9450dc43b2600adb20beed01a31734853aa02e200799152b67790329fc43ca051493cd7a091414ac24dee210105273c11e7aa676377013ffea57378c9cb73699
-  data.tar.gz: eb934e44f1f1a8f1cf4babc2af41a1f871a524026a7c01398e36ea2a4d427b964f1540e6cad3aa6a304b1ad1463d16b2c9ca7d019c007c19dcc901510bce6df7
+  metadata.gz: 546cecc934bcb6cd962224a9ca2348c1c83793a004cec91f876352efb805000bf17279bbbdd8ca41fcb941822caf75c34fdb0bb3eed8cebb9860893a81cd7302
+  data.tar.gz: 5c7a710ca05a40cbd2154321ebfda7916fe21cba972cff503384da5e6fc5f385357d3288b2f76dcf00d97dff4c92a6615c81741e2ceff375faf61fe26b9d6e24

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    moodwall (0.1.3)
+    moodwall (0.1.4)
 
 GEM
   remote: https://rubygems.org/

data/bin/moodwall

@@ -8,108 +8,13 @@ rescue LoadError
   require "moodwall"
 end
 
-require "optparse"
-require 'ostruct'
-require 'pp'
-
-class Moodwall::Optparse
-  class ScriptOptions
-    attr_accessor :change, :add, :list,
-                  :mood, :wallpaper,
-                  :path, :mood_name
-
-    def initialize
-      self.change    = true
-      self.add       = false
-      self.list      = false
-      self.mood      = false
-      self.wallpaper = true
-    end
-
-    def define_options(parser)
-      parser.banner = "Usage: moodwall [options]\nDefaults: moodwall -c -w"
-      parser.separator ""
-      parser.separator "Specific options:"
-
-      # additional commands
-      change_option(parser)
-      add_option(parser)
-      list_option(parser)
-
-      wallpaper_option(parser)
-      mood_option(parser)
-
-      parser.separator ""
-      parser.separator "Common options:"
-
-      parser.on_tail("-h", "--help", "Show this message") do
-        puts parser
-        exit
-      end
-
-      parser.on_tail("-v", "--version", "Show version") do
-        puts Moodwall::VERSION
-        exit
-      end
-    end
-
-    def change_option(parser)
-      parser.on("-c", "--change", "Change [target]") do
-        self.change = true
-        self.add = false
-      end
-    end
-
-    def add_option(parser)
-      parser.on("-a", "--add", "Add [target]") do
-        self.add = true
-        self.change = false
-      end
-    end
-
-    def list_option(parser)
-      parser.on("-l", "--list", "List [targets]") do
-        self.list = true
-        self.add = false
-        self.change = false
-      end
-    end
-
-    def wallpaper_option(parser)
-      parser.on("-w", "--wallpaper [PATH]", "Specifies wallpaper path") do |path, mood_name|
-        self.wallpaper = true
-        self.path = path
-        self.mood_name = mood_name
-      end
-    end
-
-    def mood_option(parser)
-      parser.on("-m", "--mood [NAME]", "Specifies mood name") do |mood_name|
-        self.mood = true
-        self.mood_name = mood_name
-      end
-    end
-  end
-
-  def parse(args)
-    @options = ScriptOptions.new
-    @args = OptionParser.new do |parser|
-      @options.define_options(parser)
-      parser.parse!(args)
-    end
-    @options
-  end
-
-  attr_reader :parser, :options
-end
-
 options = Moodwall::Optparse.new.parse(ARGV)
 
 case
 when options.add && options.mood && !options.mood_name.nil? && options.path.nil?
   Moodwall::Mood.new({name: options.mood_name}).save
 when options.change && options.mood && !options.mood_name.nil?
-  Moodwall::Mood.change_current(name: options.mood_name)
+  Moodwall::Mood.choose_current(name: options.mood_name)
 when options.add && options.wallpaper && !options.path.nil? && !options.mood_name.nil?
   mood = Moodwall::Mood.find_by_name(options.mood_name)
   Moodwall::Wallpaper.new({path: options.path, mood_id: mood.id}).save

data/lib/moodwall.rb

@@ -4,6 +4,7 @@ require "moodwall/repository"
 require "moodwall/record"
 require "moodwall/mood"
 require "moodwall/wallpaper"
+require "moodwall/optparse"
 
 module Moodwall
   # Your code goes here...

data/lib/moodwall/optparse.rb

@@ -0,0 +1,94 @@
+require "optparse"
+
+module Moodwall
+  class Optparse
+    attr_reader :parser, :options
+
+    def initialize(options = ScriptOptions.new)
+      @options = options
+    end
+
+    def parse(args)
+      @args = OptionParser.new do |parser|
+        options.define_options(parser)
+        parser.parse!(args)
+      end
+      options
+    end
+
+    class ScriptOptions
+      attr_accessor :change, :add, :list, :mood,
+                    :wallpaper, :path, :mood_name
+
+      def initialize
+        self.change    = true
+        self.add       = false
+        self.list      = false
+        self.mood      = false
+        self.wallpaper = true
+      end
+
+      def define_options(parser)
+        parser.banner = "Usage: moodwall [options]\nDefaults: moodwall -c -w"
+        parser.separator ""
+        parser.separator "Specific options"
+
+        change_option(parser)
+        add_option(parser)
+        list_option(parser)
+
+        wallpaper_option(parser)
+        mood_option(parser)
+
+        parser.separator ""
+        parser.separator "Common options:"
+
+        parser.on_tail("-h", "--help", "Show this message") do
+          puts parser
+          exit
+        end
+
+        parser.on_tail("-v", "--version", "Show version") do
+          puts Moodwall::VERSION
+          exit
+        end
+      end
+
+      def change_option(parser)
+        parser.on("-c", "--change", "Change [target]") do
+          self.change = true
+          self.add = false
+        end
+      end
+
+      def add_option(parser)
+        parser.on("-a", "--add", "Add [target]") do
+          self.add = true
+          self.change = false
+        end
+      end
+
+      def list_option(parser)
+        parser.on("-l", "--list", "List [targets]") do
+          self.list = true
+          self.add = false
+          self.change = false
+        end
+      end
+
+      def wallpaper_option(parser)
+        parser.on("-w", "--wallpaper [PATH]", "Specifies wallpaper path") do |path|
+          self.wallpaper = true
+          self.path = path
+        end
+      end
+
+      def mood_option(parser)
+        parser.on("-m", "--mood [NAME]", "Specifies mood name") do |mood_name|
+          self.mood = true
+          self.mood_name = mood_name
+        end
+      end
+    end
+  end
+end

data/lib/moodwall/version.rb

@@ -1,3 +1,3 @@
 module Moodwall
-  VERSION = "0.1.3"
+  VERSION = "0.1.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moodwall
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Valiantsin Mikhaliuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-06 00:00:00.000000000 Z
+date: 2018-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - lib/moodwall.rb
 - lib/moodwall/executable.rb
 - lib/moodwall/mood.rb
+- lib/moodwall/optparse.rb
 - lib/moodwall/record.rb
 - lib/moodwall/repository.rb
 - lib/moodwall/version.rb