imuzer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfeef28b31dedd79ffe26e97ef422b17a81e283a
-  data.tar.gz: 32f935c175d2fd389ff948085fb9fd9b50ec8b54
+  metadata.gz: a68ce8613fe16537351c9044ca646fbc10041de9
+  data.tar.gz: 259522091d5b725f52a800bcb7bc734bee4b1150
 SHA512:
-  metadata.gz: 34fda419761cbd11f5501cdf62ff555d6b49f1d84e114ee8753bb730859ed2923ab73024db248ddee7dae37498556aa46288e723221c88735deb4745b802bc41
-  data.tar.gz: 509ef1b1e26dd3490313c9794a90117a2ac581c0f51d4ee561f8b759974d1efcb72b4a1852868461ea0fa7fad34bb187df4ade9230024075cc4b3a96a0025252
+  metadata.gz: bde532ec27f9b9ee0412e9398677f98d55d23b63c5984c414dd3bab001478f13a270d4cedad1b1be73bb6728ef6420bc775f535ce81b1f74238ae0586f225e4d
+  data.tar.gz: b0f479ec10dafe3fb2db0d25d293b765e0c5b82d525fd628ede90eed315d82e678f57f0394b309865c4ac924e9ffcb04185aa8d01130db3ebc47e530488a4811

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    imuzer (0.0.1)
+    imuzer (0.0.2)
+      gli (= 2.13.4)
       json (~> 1.8.3)
       methadone (~> 1.9.2)
       rainbow (~> 2.1.0)
@@ -9,7 +10,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (0.13.0)
+    aruba (0.14.0)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
@@ -34,6 +35,7 @@ GEM
     diff-lcs (1.2.5)
     ffi (1.9.10)
     gherkin (3.2.0)
+    gli (2.13.4)
     json (1.8.3)
     methadone (1.9.2)
       bundler
@@ -68,3 +70,6 @@ DEPENDENCIES
   rake (~> 10.0)
   rdoc
   rspec (~> 3)
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -13,7 +13,8 @@ imuzer is a minimalistic gem that lets you generate music from the online music
 
 ## Usage
 
-    [yacin@mac imuzer (master)]$ bundle exec bin/imuzer -h
+    [yacin@mac imuzer (master)]$ imuzer -h
+
     Usage: imuzer [options] duration genre subgenre structure
 
     Composes a track with iMuze
@@ -43,7 +44,7 @@ imuzer is a minimalistic gem that lets you generate music from the online music
 
 Bellow is an example on how to use the tool:
 
-    bundle exec bin/imuzer -v -e beguelin@gmail.com -p cH5tRaXu 30000 edm soft 'calm:0.3,medium:0.3,dynamic:0.3'
+    [yacin@mac imuzer (master)]$ imuzer -v -e MYEMAIL -p MYPASSWORD 30000 edm soft 'calm:0.3,medium:0.3,dynamic:0.3'
 
 ## Contributing
 

data/bin/imuzer

@@ -1,57 +1,78 @@
 #!/usr/bin/env ruby
 
-require 'optparse'
+require 'gli'
 require 'methadone'
 require 'imuzer.rb'
 require 'json'
 require 'rainbow'
 
-class App
-  include Methadone::Main
-  include Methadone::CLILogging
-
-  main do |duration, genre, subgenre, structure|
-    info 'Authenticating to iMuze ....'
-    response = Imuze::CreateToken.call(options[:email], options[:password])
-    formated_json = JSON.pretty_generate(response)
-    if response['status'] == 500
-      puts Rainbow(formated_json).red
-      exit
-    else
-      puts Rainbow(formated_json).green if options[:verbose]
+include GLI::App
+program_desc 'a demo tool for iMuze API'
+
+desc 'Be verbose'
+switch [:v, :verbose]
+
+desc 'Email from your iMuze user account'
+arg_name 'email'
+flag [:e, :email]
+
+desc 'Password from your iMuze user account'
+arg_name 'password'
+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|
+    response = Imuze::GetGenres.call global_options
+    response['genres'].each do |genre|
+      print " #{genre['name']}: "
+      genre['subgenres'].each{|sg| print Rainbow("#{sg}, ").bright}
+      puts
     end
+  end
+end
 
+desc 'composes a music'
+arg 'genre', :required
+arg 'subgenre', :required
+arg 'duration', :required
+arg 'structure', :required
+command :compose do |c|
+  c.switch [:c, :crop]
+  c.flag 'fadeout_ms', arg_name: 'fadeout_ms',
+                       type: Integer,
+                       desc: 'fadeout in milliseconds'
+  c.flag 'voices_volume', arg_name: 'voices_volume',
+                          type: Integer,
+                          desc: 'volume of voice track'
+
+  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
+    genre = args[0]
+    subgenre = args[1]
+    duration = args[2]
+    structure = args[3]
+    puts 'Authenticating to iMuze ....'
+    response = Imuze::CreateToken.call global_options[:email],
+                                       global_options[:password]
+    FormatResponse.call response, options
     token = response['token']
-    info "Composing your track \"#{subgenre}\" \"#{genre}\" on iMuze .... please wait"
+    music = "\"#{subgenre}\" \"#{genre}\""
+    puts "Composing your track #{music} on iMuze .... please wait"
     start = Time.now
-    response = Imuze::CreateMusic.call(token, duration,
-                                       genre, subgenre, structure)
-
-    formated_json = JSON.pretty_generate(response)
-    if response['status'] == 500
-      puts Rainbow(formated_json).red
-      exit
-    else
-      puts Rainbow(formated_json).green if options[:verbose]
-    end
-
+    response = Imuze::CreateMusic.call token,
+                                       duration,
+                                       genre, subgenre, structure,
+                                       options
+    FormatResponse.call response, global_options
     elapsed = Time.now - start
-    info "Done composing your music in #{elapsed} seconds"
+    puts "Done composing your music in #{elapsed} seconds"
     mp3_uri = response['mp3_uri']
-    info "Playing your  \"#{subgenre}\" \"#{genre}\" mp3 from iMuze ...."
-    Imuze::GetMusic.call(token, mp3_uri)
+    puts "Playing your #{music} mp3 from iMuze ...."
+    Imuze::GetMusic.call token, mp3_uri
   end
-
-  on('-e email','--email','your imuze account email')
-  on('-p password','--password','your imuze password')
-  on('-v','--verbose','Be verbose')
-
-  version Imuzer::VERSION
-  description 'Composes a track with iMuze'
-  arg :duration, 'Track duration'
-  arg :genre, 'Track genre'
-  arg :subgenre, 'Track subgenre'
-  arg :structure, 'Track structure'
-  use_log_level_option toggle_debug_on_signal: 'USR1'
-  go!
 end
+
+exit run(ARGV)

data/imuzer.gemspec

@@ -4,27 +4,28 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'imuzer/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "imuzer"
+  spec.name          = 'imuzer'
   spec.version       = Imuzer::VERSION
-  spec.authors       = ["Yacin Bahi"]
-  spec.email         = ["yacin@imuze.io"]
+  spec.authors       = ['Yacin Bahi']
+  spec.email         = ['yacin@imuze.io']
   spec.summary       = %q{Generate music with iMuze.}
   spec.description   = %q{This gem uses the iMuze (imuze.io) API to generate music. You'll need an account on iMuze.io in order to use it.}
-  spec.homepage      = ""
-  spec.license       = "custom"
+  spec.homepage      = 'https://rubygems.org/gems/imuzer'
+  spec.license       = 'custom'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency('rdoc')
   spec.add_development_dependency('aruba')
   spec.add_development_dependency('rspec', '~> 3')
 
   spec.add_dependency('methadone', '~> 1.9.2')
+  spec.add_dependency('gli', '2.13.4')
   spec.add_dependency('json', '~> 1.8.3')
   spec.add_dependency('rainbow', '~> 2.1.0')
 end

data/lib/format_response.rb

@@ -0,0 +1,16 @@
+class FormatResponse < Struct.new(:response, :options)
+
+  def self.call(*args)
+    new(*args).call
+  end
+
+  def call
+    formated_json = JSON.pretty_generate(response)
+    if response['status'] == 500 || response['status'] == 403
+      puts Rainbow(formated_json).red
+      exit
+    else
+      puts Rainbow(formated_json).green if options[:verbose]
+    end
+  end
+end

data/lib/imuze/create_music.rb

@@ -1,5 +1,5 @@
 module Imuze
-  class CreateMusic < Struct.new(:token, :duration, :genre, :subgenre, :structure)
+  class CreateMusic < Struct.new(:token, :duration, :genre, :subgenre, :structure, :options)
     require 'uri'
     require 'net/http'
     require 'json'
@@ -33,12 +33,28 @@ module Imuze
     end
 
     def request_body
-      {
+      hash = {
         genre: genre,
         subgenre: subgenre,
         duration_ms: duration.to_i,
         structure: music_structure
-      }.to_json
+      }
+      hash.merge!(crop: crop) if crop
+      hash.merge!(fadeout_ms: fadeout_ms) if fadeout_ms
+      hash.merge!(voices_volume: voices_volume) if voices_volume
+      hash.to_json
+    end
+
+    def crop
+      options.nil? ? nil : options[:crop]
+    end
+
+    def fadeout_ms
+      options.nil? ? nil : options[:fadeout_ms]
+    end
+
+    def voices_volume
+      options.nil? ? nil : options[:voices_volume]
     end
 
     def music_structure

data/lib/imuze/get_genres.rb

@@ -0,0 +1,33 @@
+module Imuze
+  class GetGenres < Struct.new(:global_options)
+    require 'uri'
+    require 'net/http'
+    require 'json'
+
+    def self.call(*args)
+      new(*args).call
+    end
+
+    def call
+      response = http.request(get_request)
+      JSON.parse(response.read_body)
+    end
+
+    private
+
+    def url
+      @url ||= URI('http://joplin.imuze.io/genres')
+    end
+
+    def http
+      @http ||= Net::HTTP.new(url.host, url.port)
+    end
+
+    def get_request
+      request = Net::HTTP::Get.new(url)
+      request['content-type'] = 'application/json'
+      request['cache-control'] = 'no-cache'
+      request
+    end
+  end
+end

data/lib/imuze/get_music.rb

@@ -19,6 +19,7 @@ module Imuze
     private
 
     def command
-      %Q(curl "http:#{mp3_uri}"  -s -H "Content-Type: application/json"  -H "Authorization: #{token}" | mpg123 - 2> /dev/null)    end
+      %Q(curl "http:#{mp3_uri}"  -s -H "Content-Type: application/json"  -H "Authorization: #{token}" | mpg123 - 2> /dev/null)
+    end
   end
 end

data/lib/imuzer/version.rb

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

data/lib/imuzer.rb

@@ -2,6 +2,8 @@ require 'imuzer/version'
 require 'imuze/create_token'
 require 'imuze/create_music'
 require 'imuze/get_music'
+require 'imuze/get_genres'
+require 'format_response'
 
 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.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Yacin Bahi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.2
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.4
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -143,13 +157,15 @@ files:
 - features/step_definitions/imuzer_steps.rb
 - features/support/env.rb
 - imuzer.gemspec
+- lib/format_response.rb
 - lib/imuze/create_music.rb
 - lib/imuze/create_token.rb
+- lib/imuze/get_genres.rb
 - lib/imuze/get_music.rb
 - lib/imuzer.rb
 - lib/imuzer/version.rb
 - spec/something_spec.rb
-homepage: ''
+homepage: https://rubygems.org/gems/imuzer
 licenses:
 - custom
 metadata: {}
@@ -169,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Generate music with iMuze.