soundcloud9000 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc1e32472f08a791aea41714cb6965266ab7fe62
-  data.tar.gz: f36df4610ae1d4148015399eb4b0671b3b7eb90a
+  metadata.gz: c75677ab2dfb6f235a724717a31eb68509d5ac74
+  data.tar.gz: 3b2ed8c9459bffb301d89151fab20946eb6bdfb5
 SHA512:
-  metadata.gz: e58fa0fa517f910a43e083a4fe6435ebda76a3e409f39ce4257473048b45f74d8ad2cff44b9361f256c1c502b9868a687633be8261694bef06e19c08ce2a3419
-  data.tar.gz: 8d431bc98d51389dd2111fbdfb6d1ef9b95eaa20fb3204209d8a2030d4b4565f5d765547ffa700f88d3b8779d1c72cf85ab6f5f7def11ce61c64d5a831f50a84
+  metadata.gz: 070b6d1eaa479efac20187437245f0ab5baa5defc9bf5e8b1e35d1cfe5897877dbba8f858ffc453c3af2b4dc873c1048b37870988fa5d99747a60f7e02f65ea9
+  data.tar.gz: 772fc24cf1ab6715ae493070c9034f876c6e6de8e2307b306779225f39d90161a88b6a3c12a3d3e736cf1f6e3f41fd3a6b76ba998d76475a02c9b87372469007

data/.gitignore

@@ -3,3 +3,4 @@
 *.log
 Gemfile.lock
 pkg/
+*.gem

data/LICENSE

@@ -4,4 +4,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -2,16 +2,17 @@
 
 The next generation SoundCloud client. Without all these stupid CSS files. Runs on OSX and Linux.
 
-![Screen Shot 2013-01-20 at 15 37 03](https://f.cloud.github.com/assets/3432/81282/06c44c7e-630f-11e2-9a91-85c9b917835c.png)
+![Screen Shot 2019-04-28 at 20 42 40](https://user-images.githubusercontent.com/31281983/56872460-74dd2780-69f7-11e9-9d7e-247757a9a6fd.png)
+
 ![Screen Shot 2013-01-20 at 15 37 54](https://f.cloud.github.com/assets/3432/81281/06b05df4-630f-11e2-8b55-7f3c18126831.png)
 
-This hack was built at the [Music Hack Day Stockholm 2013](http://stockholm.musichackday.org/2013).
+This hack was originally built at the [Music Hack Day Stockholm 2013](http://stockholm.musichackday.org/2013).
 
 ## Requirements
 
-  * Ruby (1.9)
-  * Portaudio (19)
-  * Mpg123 (1.14)
+- Ruby (1.9)
+- Portaudio (19)
+- Mpg123 (1.14)
 
 ## Installation
 
@@ -20,46 +21,67 @@ library to compile the native extensions.
 
 ### OSX
 
-    xcode-select --install
-    brew install portaudio
-    brew install mpg123
-    gem install soundcloud9000
+```bash
+xcode-select --install
+brew install portaudio
+brew install mpg123
+gem install soundcloud9000
+```
+
+If you ever encounter a problem with `audite` being `require`d, run:
+
+```bash
+gem uninstall audite
+gem install --user audite -- --with-ldflags="-lmpg123"
+```
+
+See [this comment](https://github.com/grobie/soundcloud2000/issues/96#issuecomment-341915328) for more information.
 
 ### Debian / Ubuntu
 
-    apt-get install portaudio19-dev libmpg123-dev libncurses-dev ruby1.9.1-dev
-    gem install soundcloud9000
+```bash
+apt-get install portaudio19-dev libmpg123-dev libncurses-dev ruby1.9.1-dev
+gem install soundcloud9000
+```
 
 ## Usage
 
-  In order to use soundcloud9000, you need to [acquire a client credential for your application](http://soundcloud.com/you/apps/new). soundcloud9000 expects a valid client id to be set in the SC_CLIENT_ID environment variable.
+In order to use soundcloud9000, you need to [acquire a client credential for your application](https://stackoverflow.com/a/43962626/7127932). soundcloud9000 expects a valid client id to be set in the `SC_CLIENT_ID` environment variable.
 
-  You can either set this up in your `.bashrc` or equivalent or you can specify it on the command line:
+You can either set this up in your `.bashrc` or equivalent or you can specify it on the command line:
 
-    SC_CLIENT_ID=YOUR_CLIENT_ID soundcloud9000
+```bash
+SC_CLIENT_ID=YOUR_CLIENT_ID soundcloud9000
+```
 
 ## Features
 
-  * stream SoundCloud tracks in your terminal (`enter`)
-  * scroll through sound lists (`down` / `up`)
-  * play / pause support (`space`)
-  * forward / rewind support (`right` / `left`)
-  * play tracks of different users (`u`)
-  * play favorites from a user (`f`)
-  * play sets/playlists from a user  (`s`)
-  * level meter
+- stream SoundCloud tracks in your terminal (`enter`)
+- scroll through sound lists (`down` / `up`)
+- play / pause support (`space`)
+- forward / rewind support (`right` / `left`)
+- play tracks of different users (`u`)
+- play favorites from a user (`f`)
+- play sets/playlists from a user (`s`)
+- level meter
 
 ## Planned
 
-  * play any streams, sets or sounds
-  * better browsing between users and sound lists
+- play any streams, sets or sounds
+- better browsing between users and sound lists
+- shuffle
+- live lyrics (don't get your hopes up for this one)
 
 ## Authors
 
-  * [Matthias Georgi](https://github.com/georgi) ([@mgeorgi](https://twitter.com/mgeorgi))
-  * [Tobias Schmidt](https://github.com/grobie) ([@dagrobie](https://twitter.com/dagrobie))
+- [Matthias Georgi](https://github.com/georgi) ([@mgeorgi](https://twitter.com/mgeorgi))
+- [Tobias Schmidt](https://github.com/grobie) ([@dagrobie](https://twitter.com/dagrobie))
 
 ## Contributors
 
- *  [Travis Thieman](https://github.com/tthieman) ([@tthieman](https://twitter.com/thieman))
- *  [Sean Lewis](https://github.com/sophisticasean) ([@FricSean](https://twitter.com/fricsean))
+- [Travis Thieman](https://github.com/tthieman) ([@tthieman](https://twitter.com/thieman))
+- [Sean Lewis](https://github.com/sophisticasean) ([@FricSean](https://twitter.com/fricsean))
+
+## Current Maintainer
+
+- [Sumanth Ratna](https://github.com/sumanthratna) ([@sumanthratna](https://twitter.com/sumanthratna))

data/lib/soundcloud9000/application.rb

@@ -27,16 +27,16 @@ module Soundcloud9000
         Splash.new(
           UI::Rect.new(0, 0, Curses.cols, Curses.lines)))
 
-      @player_controller = PlayerController.new(
-        PlayerView.new(
-          UI::Rect.new(0, 0, Curses.cols, 5)), client)
-
       @track_controller = TrackController.new(
         TracksTable.new(
           UI::Rect.new(0, 5, Curses.cols, Curses.lines - 5)), client)
 
       @track_controller.bind_to(TrackCollection.new(client))
 
+      @player_controller = PlayerController.new(
+        PlayerView.new(
+          UI::Rect.new(0, 0, Curses.cols, 5)), client)
+
       @track_controller.events.on(:select) do |track|
         @player_controller.play(track)
       end
@@ -73,7 +73,7 @@ module Soundcloud9000
       case key
       when :left, :right, :space, :one, :two, :three, :four, :five, :six, :seven, :eight, :nine
         @player_controller.events.trigger(:key, key)
-      when :down, :up, :enter, :u, :f, :s, :j, :k
+      when :down, :up, :enter, :u, :f, :s, :j, :k, :m
         @track_controller.events.trigger(:key, key)
       end
     end

data/lib/soundcloud9000/controllers/track_controller.rb

@@ -52,6 +52,10 @@ module Soundcloud9000
                 @tracks.clear_and_replace
               end
             end
+          # when :im grown up, im gonna go to brown and be smarter than u, sumanth <333 (Rahel Selemon, April 29, 2019)
+          when :m
+            @tracks.shuffle = !@tracks.shuffle
+            UI::Input.message("Shuffle #{if @tracks.shuffle then "enabled" else "disabled" end}.")
           end
         end
       end
@@ -81,7 +85,11 @@ module Soundcloud9000
       end
 
       def next_track
-        @view.down
+        if @tracks.shuffle
+          @view.random
+        else
+          @view.down
+        end
         @view.select
         events.trigger(:select, current_track)
       end

data/lib/soundcloud9000/models/track_collection.rb

@@ -10,12 +10,13 @@ module Soundcloud9000
       DEFAULT_LIMIT = 50
 
       attr_reader :limit
-      attr_accessor :collection_to_load, :user, :playlist
+      attr_accessor :collection_to_load, :user, :playlist, :shuffle
 
       def initialize(client)
         super
         @limit = DEFAULT_LIMIT
         @collection_to_load = :recent
+        @shuffle = false
       end
 
       def size

data/lib/soundcloud9000/ui/input.rb

@@ -26,7 +26,8 @@ module Soundcloud9000
         '7'                => :seven,
         '8'                => :eight,
         '9'                => :nine,
-        'f'                => :f
+        'f'                => :f,
+        'm'                => :m
       }
 
       def self.get(delay = 0)
@@ -46,6 +47,12 @@ module Soundcloud9000
         result
       end
 
+      def self.message(output)
+        Curses.setpos(Curses.lines - 1, 0)
+        Curses.clrtoeol
+        Curses.addstr(output)
+      end
+
       def self.error(output)
         Curses.setpos(Curses.lines - 1, 0)
         Curses.clrtoeol

data/lib/soundcloud9000/ui/table.rb

@@ -57,6 +57,13 @@ module Soundcloud9000
         end
       end
 
+      def random
+        @current = rand(length)
+        @top -= 1 if @current < @top
+        @top += 1 if @current > body_height
+        render
+      end
+
       def select
         @selected = @current
         render

data/lib/soundcloud9000/views/player_view.rb

@@ -1,5 +1,6 @@
 require_relative '../time_helper'
 require_relative '../ui/view'
+require_relative '../models/track_collection'
 
 module Soundcloud9000
   module Views
@@ -22,6 +23,7 @@ module Soundcloud9000
 
       def draw
         line progress + download_progress
+        # p @tracks
         with_color(:green) do
           line((duration + ' - ' + status).ljust(16) + @player.title)
         end
@@ -30,7 +32,7 @@ module Soundcloud9000
       end
 
       def status
-        @player.playing? ? 'playing' : 'paused'
+        (@player.playing? ? 'playing' : 'paused') # + ' ' + (@tracks.shuffle? ? '(shuffle)' : '')
       end
 
       def progress

data/soundcloud9000.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = "soundcloud9000"
-  s.version       = "0.1.0"
+  s.version       = "0.1.1"
   s.authors       = ["Tobias Schmidt", "Matthias Georgi", "Sumanth Ratna"]
   s.email         = "sratna@sumanthratna.gq"
   s.homepage      = "http://www.github.com/sumanthratna/soundcloud9000"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soundcloud9000
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json