imuzer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a68ce8613fe16537351c9044ca646fbc10041de9
-  data.tar.gz: 259522091d5b725f52a800bcb7bc734bee4b1150
+  metadata.gz: f60d92779e8bceab0ac1f98f86797bd008bd1ed9
+  data.tar.gz: 70810d9b916f35483cf47db657d926ce57bd5e83
 SHA512:
-  metadata.gz: bde532ec27f9b9ee0412e9398677f98d55d23b63c5984c414dd3bab001478f13a270d4cedad1b1be73bb6728ef6420bc775f535ce81b1f74238ae0586f225e4d
-  data.tar.gz: b0f479ec10dafe3fb2db0d25d293b765e0c5b82d525fd628ede90eed315d82e678f57f0394b309865c4ac924e9ffcb04185aa8d01130db3ebc47e530488a4811
+  metadata.gz: 74426b2fe5a9649f6c8a26d7790bb3e82115f047bfb26558ea234722526fc18d2cf53abe5b92443938dd2df695fff997a4695d51ebe70dadc2f6888f0e0e7af2
+  data.tar.gz: 50235a18ef3500e9b4730c1793298946a56aa908b6a1a8c63ac4d43e65f4905e87993704ab8be52c15e2b88562aefac6de117c05abbe1d367fdcc9d411bb1eba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    imuzer (0.0.2)
+    imuzer (0.0.3)
       gli (= 2.13.4)
       json (~> 1.8.3)
       methadone (~> 1.9.2)

data/bin/imuzer

@@ -8,6 +8,7 @@ require 'rainbow'
 
 include GLI::App
 program_desc 'a demo tool for iMuze API'
+long_desc 'iMuzer is a tool that lets you interact with the music composition platform iMuze.io. You will need an account on iMuze.io in order to use the API. Email us at developers@imuze.io to get a developer account. You will need to have wget, curl and mpg123 installed on your computer to use all the feature of this tool.'
 
 desc 'Be verbose'
 switch [:v, :verbose]
@@ -22,8 +23,8 @@ flag [:p, :password]
 
 desc 'list all musical genres and subgenres'
 command :genres do |c|
-  puts 'Listing iMuze musical genres with sub-genres...'
   c.action do |global_options, options, args|
+    puts 'Listing iMuze musical genres with sub-genres...'
     response = Imuze::GetGenres.call global_options
     response['genres'].each do |genre|
       print " #{genre['name']}: "
@@ -40,6 +41,7 @@ arg 'duration', :required
 arg 'structure', :required
 command :compose do |c|
   c.switch [:c, :crop]
+  c.switch [:d, :download]
   c.flag 'fadeout_ms', arg_name: 'fadeout_ms',
                        type: Integer,
                        desc: 'fadeout in milliseconds'
@@ -50,6 +52,10 @@ command :compose do |c|
   c.action do |global_options, options, args|
     help_now!('credentials required to compose music') if global_options[:email].nil? || global_options[:password].nil?
     help_now!('id is required') if args.size < 3
+    help_now!('You need wget installed on your computer to continue') unless FindExecutable.call('wget')
+    exit_now!('You need curl installed on your computer to continue') unless FindExecutable.call('curl')
+    exit_now!('You need mpg123 installed on your computer to continue') unless FindExecutable.call('mpg123')
+    exit_now!('You need mpg123 installed on your computer to continue') unless FindExecutable.call('mpg123')
     genre = args[0]
     subgenre = args[1]
     duration = args[2]
@@ -71,7 +77,7 @@ command :compose do |c|
     puts "Done composing your music in #{elapsed} seconds"
     mp3_uri = response['mp3_uri']
     puts "Playing your #{music} mp3 from iMuze ...."
-    Imuze::GetMusic.call token, mp3_uri
+    Imuze::GetMusic.call token, mp3_uri, options
   end
 end
 

data/lib/find_executable.rb

@@ -0,0 +1,25 @@
+class FindExecutable < Struct.new(:executable)
+
+  def self.call(*args)
+    new(*args).call
+  end
+
+  def call
+    which(executable)
+  end
+
+  private
+  # Cross-platform way of finding an executable in the $PATH.
+  #
+  #   which('ruby') #=> /usr/bin/ruby
+  def which(cmd)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each { |ext|
+        exe = File.join(path, "#{cmd}#{ext}")
+        return exe if File.executable?(exe) && !File.directory?(exe)
+      }
+    end
+    nil
+  end
+end

data/lib/imuze/get_music.rb

@@ -1,5 +1,5 @@
 module Imuze
-  class GetMusic < Struct.new(:token, :mp3_uri)
+  class GetMusic < Struct.new(:token, :mp3_uri, :options)
     include Methadone::CLILogging
     include Methadone::SH
     require 'uri'
@@ -11,15 +11,32 @@ module Imuze
     end
 
     def call
+      download? ? command_download : command_play
+    end
+
+    private
+
+    def command_play
+      command = %Q(curl "http:#{mp3_uri}"  -s -H "Content-Type: application/json"  -H "Authorization: #{token}" | mpg123 - 2> /dev/null)
       sh command do |stdout, stderr|
         puts 'We hope you liked it !'
       end
     end
 
-    private
+    def command_download
+      command = %Q(wget "http:#{mp3_uri}" -O #{mp3_id}.mp3)
+      sh command do |stdout, stderr|
+        puts 'We hope you liked it !'
+      end
+    end
+
+    def download?
+      options.nil? ? false : options[:download]
+    end
 
-    def command
-      %Q(curl "http:#{mp3_uri}"  -s -H "Content-Type: application/json"  -H "Authorization: #{token}" | mpg123 - 2> /dev/null)
+    def mp3_id
+      puts mp3_uri.split('/')
+      mp3_uri.split('/')[4]
     end
   end
 end

data/lib/imuzer/version.rb

@@ -1,3 +1,3 @@
 module Imuzer
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/imuzer.rb

@@ -4,6 +4,7 @@ require 'imuze/create_music'
 require 'imuze/get_music'
 require 'imuze/get_genres'
 require 'format_response'
+require 'find_executable'
 
 module Imuzer
   # Your code goes here...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imuzer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yacin Bahi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,6 +157,7 @@ files:
 - features/step_definitions/imuzer_steps.rb
 - features/support/env.rb
 - imuzer.gemspec
+- lib/find_executable.rb
 - lib/format_response.rb
 - lib/imuze/create_music.rb
 - lib/imuze/create_token.rb