sync with master

.gitignore

@@ -31,3 +31,4 @@ cover_html/
 chromedriver.log
 /nbproject
 ghostdriver.log
+node_modules

cms/static/coffee/.gitignore

@@ -1,3 +1 @@
 *.js
-descriptor
-module

cms/static/sass/.gitignore

@@ -1,3 +1 @@
 *.css
-descriptor
-module

common/lib/rooted_paths.py

@@ -8,7 +8,7 @@ def rooted_glob(root, glob):
 
     Uses glob2 globbing
     """
-    return remove_root(root, glob2.glob('{root}/{glob}'.format(root=root, glob=glob)))
+    return remove_root(root, sorted(glob2.glob('{root}/{glob}'.format(root=root, glob=glob))))
 
 
 def remove_root(root, paths):

common/lib/xmodule/xmodule/js/spec/video/display/video_player_spec.coffee

@@ -37,7 +37,7 @@ xdescribe 'VideoPlayer', ->
         expect(window.VideoProgressSlider).toHaveBeenCalledWith el: $('.slider', @player.el)
 
       it 'create Youtube player', ->
-        expect(YT.Player).toHaveBeenCalledWith 'example'
+        expect(YT.Player).toHaveBeenCalledWith('example', {
           playerVars:
             controls: 0
             wmode: 'transparent'
@@ -48,6 +48,7 @@ xdescribe 'VideoPlayer', ->
           events:
             onReady: @player.onReady
             onStateChange: @player.onStateChange
+        })
 
       it 'bind to video control play event', ->
         expect($(@player.control)).toHandleWith 'play', @player.play

common/lib/xmodule/xmodule/static_content.py

@@ -68,7 +68,7 @@ def _write_styles(selector, output_root, classes):
                 css_fragments[idx, filetype, fragment].add(class_.__name__)
     css_imports = defaultdict(set)
     for (idx, filetype, fragment), classes in sorted(css_fragments.items()):
-        fragment_name = "{idx}-{hash}.{type}".format(
+        fragment_name = "{idx:0=3d}-{hash}.{type}".format(
             idx=idx,
             hash=hashlib.md5(fragment).hexdigest(),
             type=filetype)
@@ -102,7 +102,7 @@ def _write_js(output_root, classes):
 
     module_js = []
     for idx, filetype, fragment in sorted(js_fragments):
-        path = output_root / "{idx}-{hash}.{type}".format(
+        path = output_root / "{idx:0=3d}-{hash}.{type}".format(
             idx=idx,
             hash=hashlib.md5(fragment).hexdigest(),
             type=filetype)

jenkins/test.sh

@@ -40,6 +40,8 @@ yes w | pip install -q -r requirements.txt
 
 bundle install
 
+npm install
+
 rake clobber
 rake pep8 > pep8.log || cat pep8.log
 rake pylint > pylint.log || cat pylint.log

lms/static/coffee/.gitignore

@@ -1,2 +1 @@
 *.js
-module

lms/static/sass/.gitignore

@@ -1,2 +1 @@
 *.css
-module

rakefile

@@ -93,7 +93,7 @@ end
 def template_jasmine_runner(lib)
     coffee_files = Dir["#{lib}/**/js/**/*.coffee", "common/static/coffee/src/**/*.coffee"]
     if !coffee_files.empty?
-        sh("coffee -c #{coffee_files.join(' ')}")
+        sh("node_modules/.bin/coffee -c #{coffee_files.join(' ')}")
     end
     phantom_jasmine_path = File.expand_path("common/test/phantom-jasmine")
     common_js_root = File.expand_path("common/static/js")
@@ -128,7 +128,7 @@ def compile_assets(watch=false, debug=false)
                        --command='#{xmodule_cmd}' \
                        common/lib/xmodule"
     end
-    coffee_cmd = "coffee #{watch ? '--watch' : ''} --compile */static"
+    coffee_cmd = "node_modules/.bin/coffee #{watch ? '--watch' : ''} --compile */static"
     sass_cmd = "sass #{debug ? '--debug-info' : '--style compressed'} " +
                      "--load-path ./common/static/sass " +
                      "--require ./common/static/sass/bourbon/lib/bourbon.rb " +
@@ -142,6 +142,9 @@ def compile_assets(watch=false, debug=false)
             puts "Waiting for `#{cmd}` to complete (pid #{pid})"
             Process.wait(pid)
             puts "Completed"
+            if !$?.exited? || $?.exitstatus != 0
+                abort "`#{cmd}` failed"
+            end
         end
     end
 end
@@ -155,6 +158,24 @@ default_options = {
     :cms => '8001',
 }
 
+desc "Install all prerequisites needed for the lms and cms"
+task :install_prereqs => [:install_node_prereqs, :install_ruby_prereqs, :install_python_prereqs]
+
+desc "Install all node prerequisites for the lms and cms"
+task :install_node_prereqs do
+    sh('npm install')
+end
+
+desc "Install all ruby prerequisites for the lms and cms"
+task :install_ruby_prereqs do
+    sh('bundle install')
+end
+
+desc "Install all python prerequisites for the lms and cms"
+task :install_python_prereqs do
+    sh('pip install -r requirements.txt')
+end
+
 task :predjango do
     sh("find . -type f -name *.pyc -delete")
     sh('pip install -q --no-index -r local-requirements.txt')